CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-22 11:46:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Master-merge

Browse Source
This commit is contained in:
Tom MacWright
2016-09-03 17:02:38 -04:00
parent 202482519a 8c29dd9348
commit 27f9f75eae
18 changed files with 187 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.eslintrc
+1
View File
@@ -58,6 +58,7 @@
"no-warning-comments": "warn",
"no-with": "error",
"no-use-before-define": ["off", "nofunc"],
"radix": ["error", "always"],
"semi": ["error", "always"],
"semi-spacing": "error",
"space-unary-ops": "error",
data/presets.yaml
+24
View File
@@ -321,6 +321,9 @@ en:
types:
'cycleway:left': Left side
'cycleway:right': Right side
date:
# date=*
label: Date
delivery:
# delivery=*
label: Delivery
@@ -336,6 +339,9 @@ en:
diaper:
# diaper=*
label: Diaper Changing Available
display:
# display=*
label: Display
dock:
# dock=*
label: Type
@@ -1040,6 +1046,9 @@ en:
supervised:
# supervised=*
label: Supervised
support:
# support=*
label: Support
surface:
# surface=*
label: Surface
@@ -1122,6 +1131,16 @@ en:
vending:
# vending=*
label: Type of Goods
visibility:
# visibility=*
label: Visibility
options:
# visibility=area
area: Over 20m (65ft)
# visibility=house
house: Up to 5m (16ft)
# visibility=street
street: 5 to 20m (16 to 65ft)
water:
# water=*
label: Type
@@ -1368,6 +1387,11 @@ en:
# amenity=courthouse
name: Courthouse
terms: '<translate with synonyms or related terms for ''Courthouse'', separated by commas>'
amenity/coworking_space:
# amenity=coworking_space
name: Coworking Space
# 'terms: coworking,office'
terms: '<translate with synonyms or related terms for ''Coworking Space'', separated by commas>'
amenity/dentist:
# amenity=dentist
name: Dentist
data/presets/fields.json
+33
View File
@@ -418,6 +418,11 @@
}
}
},
"date": {
"key": "date",
"type": "check",
"label": "Date"
},
"delivery": {
"key": "delivery",
"type": "check",
@@ -454,6 +459,17 @@
"5"
]
},
"display": {
"key": "display",
"type": "combo",
"label": "Display",
"options": [
"analog",
"digital",
"sundial",
"unorthodox"
]
},
"dock": {
"key": "dock",
"type": "combo",
@@ -1391,6 +1407,11 @@
"type": "check",
"label": "Supervised"
},
"support": {
"key": "support",
"type": "combo",
"label": "Support"
},
"surface": {
"key": "surface",
"type": "combo",
@@ -1489,6 +1510,18 @@
"type": "combo",
"label": "Type of Goods"
},
"visibility": {
"key": "visibility",
"type": "combo",
"label": "Visibility",
"strings": {
"options": {
"house": "Up to 5m (16ft)",
"street": "5 to 20m (16 to 65ft)",
"area": "Over 20m (65ft)"
}
}
},
"water_point": {
"key": "water_point",
"type": "check",
data/presets/fields/date.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "date",
"type": "check",
"label": "Date"
}
data/presets/fields/display.json
+6
View File
@@ -0,0 +1,6 @@
{
"key": "display",
"type": "combo",
"label": "Display",
"options": ["analog", "digital", "sundial", "unorthodox"]
}
data/presets/fields/support.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "support",
"type": "combo",
"label": "Support"
}
data/presets/fields/visibility.json
+12
View File
@@ -0,0 +1,12 @@
{
"key": "visibility",
"type": "combo",
"label": "Visibility",
"strings": {
"options": {
"house": "Up to 5m (16ft)",
"street": "5 to 20m (16 to 65ft)",
"area": "Over 20m (65ft)"
}
}
}
data/presets/presets.json
+34 -2
View File
@@ -906,6 +906,12 @@
"name": "Clinic"
},
"amenity/clock": {
"fields": [
"support",
"display",
"visibility",
"date"
],
"geometry": [
"point",
"vertex"
@@ -980,6 +986,26 @@
},
"name": "Courthouse"
},
"amenity/coworking_space": {
"icon": "commercial",
"fields": [
"address",
"building_area",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"terms": [
"coworking",
"office"
],
"tags": {
"amenity": "coworking_space"
},
"name": "Coworking Space"
},
"amenity/dentist": {
"icon": "dentist",
"fields": [
@@ -4231,6 +4257,7 @@
"name": "Defibrillator"
},
"emergency/fire_hydrant": {
"icon": "fire-station",
"fields": [
"fire_hydrant/type"
],
@@ -5836,6 +5863,9 @@
},
"leisure/garden": {
"icon": "garden",
"fields": [
"access_simple"
],
"geometry": [
"point",
"vertex",
@@ -6051,7 +6081,8 @@
"fields": [
"surface",
"hoops",
"lit"
"lit",
"access_simple"
],
"geometry": [
"point",
@@ -6153,7 +6184,8 @@
"icon": "tennis",
"fields": [
"surface",
"lit"
"lit",
"access_simple"
],
"geometry": [
"point",
data/presets/presets/amenity/clock.json
+7 -1
View File
@@ -1,4 +1,10 @@
{
"fields": [
"support",
"display",
"visibility",
"date"
],
"geometry": [
"point",
"vertex"
@@ -7,4 +13,4 @@
"amenity": "clock"
},
"name": "Clock"
}
}
data/presets/presets/amenity/coworking_space.json
+20
View File
@@ -0,0 +1,20 @@
{
"icon": "commercial",
"fields": [
"address",
"building_area",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"terms": [
"coworking",
"office"
],
"tags": {
"amenity": "coworking_space"
},
"name": "Coworking Space"
}
data/presets/presets/emergency/fire_hydrant.json
+1
View File
@@ -1,4 +1,5 @@
{
"icon": "fire-station",
"fields": [
"fire_hydrant/type"
],
data/presets/presets/leisure/garden.json
+3
View File
@@ -1,5 +1,8 @@
{
"icon": "garden",
"fields": [
"access_simple"
],
"geometry": [
"point",
"vertex",
data/presets/presets/leisure/pitch/basketball.json
+2 -1
View File
@@ -3,7 +3,8 @@
"fields": [
"surface",
"hoops",
"lit"
"lit",
"access_simple"
],
"geometry": [
"point",
data/presets/presets/leisure/pitch/tennis.json
+2 -1
View File
@@ -2,7 +2,8 @@
"icon": "tennis",
"fields": [
"surface",
"lit"
"lit",
"access_simple"
],
"geometry": [
"point",
data/taginfo.json
+4
View File
@@ -227,6 +227,10 @@
"key": "amenity",
"value": "courthouse"
},
{
"key": "amenity",
"value": "coworking_space"
},
{
"key": "amenity",
"value": "dentist"
dist/locales/en.json
Vendored
+21
View File
@@ -914,6 +914,9 @@
}
}
},
"date": {
"label": "Date"
},
"delivery": {
"label": "Delivery"
},
@@ -929,6 +932,9 @@
"diaper": {
"label": "Diaper Changing Available"
},
"display": {
"label": "Display"
},
"dock": {
"label": "Type"
},
@@ -1499,6 +1505,9 @@
"supervised": {
"label": "Supervised"
},
"support": {
"label": "Support"
},
"surface": {
"label": "Surface"
},
@@ -1564,6 +1573,14 @@
"vending": {
"label": "Type of Goods"
},
"visibility": {
"label": "Visibility",
"options": {
"house": "Up to 5m (16ft)",
"street": "5 to 20m (16 to 65ft)",
"area": "Over 20m (65ft)"
}
},
"water_point": {
"label": "Water Point"
},
@@ -1815,6 +1832,10 @@
"name": "Courthouse",
"terms": ""
},
"amenity/coworking_space": {
"name": "Coworking Space",
"terms": "coworking,office"
},
"amenity/dentist": {
"name": "Dentist",
"terms": "tooth,teeth"
modules/core/way.js
+6 -6
View File
@@ -147,11 +147,11 @@ _.extend(Way.prototype, {
break;
}
if (this.tags.lanes) metadata.count = parseInt(this.tags.lanes);
if (this.tags.lanes) metadata.count = parseInt(this.tags.lanes, 10);
metadata.oneway = this.isOneWay();
if (parseInt(this.tags.oneway) === -1) {
if (parseInt(this.tags.oneway, 10) === -1) {
metadata.forward = 0;
metadata.bothways = 0;
metadata.backward = metadata.count;
@@ -161,12 +161,12 @@ _.extend(Way.prototype, {
metadata.bothways = 0;
metadata.backward = 0;
} else {
metadata.bothways = parseInt(this.tags['lanes:both_ways']) > 0 ? 1 : 0;
metadata.forward = parseInt(this.tags['lanes:forward']);
metadata.backward = parseInt(this.tags['lanes:backward']);
metadata.bothways = parseInt(this.tags['lanes:both_ways'], 10) > 0 ? 1 : 0;
metadata.forward = parseInt(this.tags['lanes:forward'], 10);
metadata.backward = parseInt(this.tags['lanes:backward'], 10);
if (_.isNaN(metadata.forward) && _.isNaN(metadata.backward)) {
metadata.forward = parseInt((metadata.count - metadata.bothways) / 2);
metadata.forward = (metadata.count - metadata.bothways) / 2;
metadata.backward = metadata.count - metadata.bothways - metadata.forward;
}
else if (_.isNaN(metadata.forward)) {
package.json
+1 -1
View File
@@ -40,8 +40,8 @@
"d3": "4.2.1",
"ecstatic": "~2.1.0",
"editor-layer-index": "git://github.com/osmlab/editor-layer-index.git#gh-pages",
"eslint": "~3.3.1",
"gaze": "~1.1.1",
"eslint": "~3.4.0",
"glob": "~7.0.5",
"happen": "~0.3.1",
"js-yaml": "~3.6.1",