Merge branch 'master' of github.com:systemed/iD

This commit is contained in:
Tom MacWright
2013-03-11 12:21:39 -04:00
463 changed files with 1078 additions and 1045 deletions
-1
View File
@@ -17,7 +17,6 @@ data/data.js: $(DATA_FILES)
.INTERMEDIATE iD.js: \
js/lib/bootstrap-tooltip.js \
js/lib/d3.v3.js \
js/lib/d3.checkselect.js \
js/lib/d3.combobox.js \
js/lib/d3.geo.tile.js \
js/lib/d3.keybinding.js \
+7
View File
@@ -1,4 +1,5 @@
var fs = require('fs'),
path = require('path'),
glob = require('glob');
function read(f) {
@@ -13,6 +14,12 @@ function rp(f) {
return r('presets/' + f);
}
var forms = {};
glob.sync(__dirname + '/data/presets/forms/*.json').forEach(function(file) {
forms[path.basename(file, '.json')] = read(file);
});
fs.writeFileSync('data/presets/forms.json', JSON.stringify(forms));
fs.writeFileSync('data/presets/presets.json', JSON.stringify(
glob.sync(__dirname + '/data/presets/presets/**/*.json').map(function(file) {
return read(file);
+10
View File
@@ -670,6 +670,10 @@ div.combobox {
border-top: 0;
}
.combobox-input {
cursor: pointer;
}
.combobox-carat {
margin-left: -15px;
margin-right: 5px;
@@ -729,6 +733,12 @@ div.combobox {
opacity: 1;
}
.preset-radio button {
font-weight: normal;
padding: 2px 10px;
height: 30px;
}
/* Address input */
.preset-input .addr-housename {
+21
View File
@@ -23,6 +23,10 @@ path {
fill: none;
}
use {
pointer-events: none;
}
/* points */
g.point circle {
@@ -625,6 +629,14 @@ path.casing.tag-bridge-yes {
stroke: #333;
}
path.stroke.tag-highway.tag-tunnel-yes {
stroke-opacity: 0.3;
}
path.casing.tag-highway.tag-tunnel-yes {
stroke-opacity: 0.5;
}
path.stroke.tag-highway-construction,
path.casing.tag-highway-construction {
stroke-linecap: butt;
@@ -664,6 +676,15 @@ svg[data-zoom="16"] path.casing.tag-highway-construction {
stroke: #222;
}
.line.stroke.tag-railway-platform {
stroke: #999;
stroke-width: 4;
stroke-dasharray: none;
}
.line.casing.tag-railway-platform {
stroke: none;
}
/* waterways */
path.fill.tag-waterway {
+1 -93
View File
@@ -1,93 +1 @@
{
"cuisine": {
"key": "cuisine",
"type": "combo",
"indexed": true
},
"internet_access": {
"key": "internet_access",
"title": "Internet Access",
"type": "select",
"options": ["yes", "no", "wlan", "wired", "terminal"]
},
"building_area": {
"key": "building",
"type": "check",
"default": { "area": "yes" }
},
"address": {
"type": "address",
"title": "Address"
},
"operator": {
"key": "operator",
"type": "text"
},
"religion": {
"key": "religion",
"type": "select",
"options": ["christian", "muslim", "buddhist", "jewish", "hindu", "shinto", "taoist"]
},
"denomination": {
"key": "denomination",
"type": "combo"
},
"building": {
"key": "building",
"type": "combo"
},
"building_yes": {
"key": "building",
"type": "combo",
"default": { "area": "yes" }
},
"levels": {
"key": "building:levels",
"type": "number",
"title": "Levels"
},
"fee": {
"key": "fee",
"type": "check"
},
"access": {
"key": "access",
"type": "combo"
},
"atm": {
"key": "atm",
"type": "check"
},
"shelter": {
"key": "shelter",
"type": "check"
},
"emergency": {
"key": "emergency",
"type": "check"
},
"oneway": {
"key": "oneway",
"type": "check"
},
"bridge": {
"key": "bridge",
"type": "check"
},
"tunnel": {
"key": "tunnel",
"type": "check"
},
"maxspeed": {
"key": "maxspeed",
"type": "combo"
},
"surface": {
"key": "surface",
"type": "combo"
},
"layer": {
"key": "layer",
"type": "combo"
}
}
{"access":{"key":"access","type":"combo"},"address":{"type":"address","title":"Address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"]},"atm":{"key":"atm","type":"check"},"bridge":{"key":"bridge","type":"defaultcheck"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"elevation":{"key":"ele","type":"number"},"emergency":{"key":"emergency","type":"check"},"fee":{"key":"fee","type":"check"},"internet_access":{"key":"internet_access","title":"Internet Access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"layer":{"key":"layer","type":"combo"},"levels":{"key":"building:levels","type":"number","title":"Levels"},"maxspeed":{"key":"maxspeed","type":"combo"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"title":" ","type":"radio","options":["bridge","tunnel","embankment","cutting"]},"shelter":{"key":"shelter","type":"check"},"surface":{"key":"surface","type":"combo"},"tunnel":{"key":"tunnel","type":"defaultcheck"}}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "access",
"type": "combo"
}
+10
View File
@@ -0,0 +1,10 @@
{
"type": "address",
"title": "Address",
"keys": [
"addr:housename",
"addr:housenumber",
"addr:street",
"addr:city"
]
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "atm",
"type": "check"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "bridge",
"type": "defaultcheck"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "building",
"type": "combo"
}
+7
View File
@@ -0,0 +1,7 @@
{
"key": "building",
"type": "check",
"default": {
"area": "yes"
}
}
+7
View File
@@ -0,0 +1,7 @@
{
"key": "building",
"type": "combo",
"default": {
"area": "yes"
}
}
+5
View File
@@ -0,0 +1,5 @@
{
"key": "cuisine",
"type": "combo",
"indexed": true
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "denomination",
"type": "combo"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "ele",
"type": "number"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "emergency",
"type": "check"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "fee",
"type": "check"
}
+12
View File
@@ -0,0 +1,12 @@
{
"key": "internet_access",
"title": "Internet Access",
"type": "combo",
"options": [
"yes",
"no",
"wlan",
"wired",
"terminal"
]
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "layer",
"type": "combo"
}
+5
View File
@@ -0,0 +1,5 @@
{
"key": "building:levels",
"type": "number",
"title": "Levels"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "maxspeed",
"type": "combo"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "oneway",
"type": "check"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "opening_hours",
"type": "text"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "operator",
"type": "text"
}
+13
View File
@@ -0,0 +1,13 @@
{
"key": "religion",
"type": "combo",
"options": [
"christian",
"muslim",
"buddhist",
"jewish",
"hindu",
"shinto",
"taoist"
]
}
+10
View File
@@ -0,0 +1,10 @@
{
"title": " ",
"type": "radio",
"options": [
"bridge",
"tunnel",
"embankment",
"cutting"
]
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "shelter",
"type": "check"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "surface",
"type": "combo"
}
+4
View File
@@ -0,0 +1,4 @@
{
"key": "tunnel",
"type": "defaultcheck"
}
File diff suppressed because one or more lines are too long
+20
View File
@@ -0,0 +1,20 @@
{
"name": "aeroway",
"match": {
"type": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"aeroway": "*"
}
},
"form": [
{
"key": "aeroway",
"type": "combo"
}
]
}
+18
View File
@@ -0,0 +1,18 @@
{
"name": "amenity",
"match": {
"type": [
"point",
"area"
],
"tags": {
"amenity": "*"
}
},
"form": [
{
"key": "amenity",
"type": "combo"
}
]
}
@@ -0,0 +1,16 @@
{
"name": "grave yard",
"match": {
"type": [
"point",
"area"
],
"tags": {
"amenity": "grave_yard"
}
},
"icon": "cemetery",
"form": [
"religion"
]
}
@@ -12,7 +12,6 @@
},
"icon": "pharmacy",
"form": [
"dispensing",
"operator",
"building_area",
"address"
@@ -11,7 +11,6 @@
"amenity": "toilets"
}
},
"icon": "",
"form": [
"operator",
"building",
@@ -2,6 +2,7 @@
"name": "building",
"match": {
"type": [
"point",
"area"
],
"tags": {
+20
View File
@@ -0,0 +1,20 @@
{
"name": "highway",
"match": {
"type": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"highway": "*"
}
},
"form": [
{
"key": "highway",
"type": "combo"
}
]
}
@@ -12,7 +12,6 @@
"zebra crossing"
]
},
"icon": "",
"form": [
{
"key": "crossing",
+2 -3
View File
@@ -12,10 +12,9 @@
"icon": "highway-cycleway",
"form": [
"oneway",
"bridge",
"tunnel",
"roadtype",
"access",
"maxspeed",
"surface"
]
}
}
+2 -3
View File
@@ -12,10 +12,9 @@
"icon": "highway-motorway",
"form": [
"oneway",
"bridge",
"tunnel",
"roadtype",
"access",
"maxspeed",
"surface"
]
}
}
+1 -2
View File
@@ -12,8 +12,7 @@
"icon": "highway-path",
"form": [
"oneway",
"bridge",
"tunnel",
"roadtype",
"access",
"maxspeed",
"surface"
+2 -3
View File
@@ -12,10 +12,9 @@
"icon": "highway-primary",
"form": [
"oneway",
"bridge",
"tunnel",
"roadtype",
"access",
"maxspeed",
"surface"
]
}
}
@@ -12,8 +12,7 @@
"icon": "highway-residential",
"form": [
"oneway",
"bridge",
"tunnel",
"roadtype",
"access",
"maxspeed",
"surface"
+1 -2
View File
@@ -12,8 +12,7 @@
"icon": "highway-secondary",
"form": [
"oneway",
"bridge",
"tunnel",
"roadtype",
"access",
"maxspeed",
"surface"
+1 -1
View File
@@ -13,7 +13,7 @@
"form": [
{
"key": "service",
"type": "select",
"type": "combo",
"options": ["parking_aisle", "driveway", "alley", "drive-through", "emergency_access"]
},
"oneway",
-1
View File
@@ -12,7 +12,6 @@
"staircase"
]
},
"icon": "",
"form": [
"access",
"surface"
+1 -2
View File
@@ -12,8 +12,7 @@
"icon": "highway-tertiary",
"form": [
"oneway",
"bridge",
"tunnel",
"roadtype",
"access",
"maxspeed",
"surface"
+1 -2
View File
@@ -12,8 +12,7 @@
"icon": "highway-track",
"form": [
"oneway",
"bridge",
"tunnel",
"roadtype",
"access",
"maxspeed",
"surface"
+1 -2
View File
@@ -12,8 +12,7 @@
"icon": "highway-trunk",
"form": [
"oneway",
"bridge",
"tunnel",
"roadtype",
"access",
"maxspeed",
"surface"
@@ -0,0 +1,20 @@
{
"name": "unclassified",
"match": {
"type": [
"line"
],
"tags": {
"highway": "unclassified"
},
"terms": []
},
"icon": "highway",
"form": [
"oneway",
"roadtype",
"access",
"maxspeed",
"surface"
]
}
+18
View File
@@ -0,0 +1,18 @@
{
"name": "landuse",
"match": {
"type": [
"point",
"area"
],
"tags": {
"landuse": "*"
}
},
"form": [
{
"key": "landuse",
"type": "combo"
}
]
}
+1 -2
View File
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
+1 -2
View File
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
@@ -16,6 +16,5 @@
"type": "combo"
},
"operator"
],
"icon": ""
]
}
+1 -2
View File
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
+1 -2
View File
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
+1 -2
View File
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
+1 -2
View File
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
+1 -2
View File
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
+1 -2
View File
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
+1 -2
View File
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
+1 -2
View File
@@ -11,6 +11,5 @@
]
},
"form": [
],
"icon": ""
]
}
+18
View File
@@ -0,0 +1,18 @@
{
"name": "leisure",
"match": {
"type": [
"point",
"area"
],
"tags": {
"leisure": "*"
}
},
"form": [
{
"key": "leisure",
"type": "combo"
}
]
}
+4
View File
@@ -12,6 +12,10 @@
},
"icon": "pitch",
"form": [
{
"key": "sport",
"type": "combo"
},
"surface"
]
}
+14
View File
@@ -0,0 +1,14 @@
{
"name": "man made",
"match": {
"type": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"man_made": "*"
}
}
}
@@ -0,0 +1,12 @@
{
"name": "lighthouse",
"match": {
"type": [
"point",
"area"
],
"tags": {
"man_made": "lighthouse"
}
}
}
+18
View File
@@ -0,0 +1,18 @@
{
"name": "natural",
"match": {
"type": [
"point",
"area"
],
"tags": {
"natural": "*"
}
},
"form": [
{
"key": "natural",
"type": "combo"
}
]
}
+1 -2
View File
@@ -10,6 +10,5 @@
"tags": {
"natural": "bay"
}
},
"icon": ""
}
}
+1 -2
View File
@@ -13,6 +13,5 @@
},
"form": [
"surface"
],
"icon": ""
]
}
+1 -2
View File
@@ -12,6 +12,5 @@
"tags": {
"natural": "cliff"
}
},
"icon": ""
}
}
+1 -2
View File
@@ -10,6 +10,5 @@
"tags": {
"natural": "coastline"
}
},
"icon": ""
}
}
+1 -2
View File
@@ -9,6 +9,5 @@
"tags": {
"natural": "glacier"
}
},
"icon": ""
}
}
+1 -2
View File
@@ -10,6 +10,5 @@
"tags": {
"natural": "grassland"
}
},
"icon": ""
}
}
+1 -2
View File
@@ -9,6 +9,5 @@
"tags": {
"natural": "heath"
}
},
"icon": ""
}
}
+4 -1
View File
@@ -24,5 +24,8 @@
"top"
]
},
"icon": ""
"icon": "triangle",
"form": [
"elevation"
]
}
+1 -2
View File
@@ -8,6 +8,5 @@
"natural": "scrub"
},
"terms": []
},
"icon": ""
}
}
+1 -2
View File
@@ -10,6 +10,5 @@
"tags": {
"natural": "spring"
}
},
"icon": ""
}
}
+1 -2
View File
@@ -14,6 +14,5 @@
"key": "water",
"type": "combo"
}
],
"icon": ""
]
}
+1 -2
View File
@@ -13,6 +13,5 @@
"loch",
"mere"
]
},
"icon": ""
}
}
+1 -2
View File
@@ -15,6 +15,5 @@
"pool",
"mere"
]
},
"icon": ""
}
}
@@ -10,6 +10,5 @@
},
"terms": [
]
},
"icon": ""
}
}
+1 -2
View File
@@ -15,6 +15,5 @@
"key": "wetland",
"type": "combo"
}
],
"icon": ""
]
}
+22
View File
@@ -0,0 +1,22 @@
{
"name": "office",
"match": {
"type": [
"point",
"area"
],
"tags": {
"office": "*"
},
"terms": []
},
"icon": "commercial",
"form": [
{
"key": "office",
"type": "combo"
},
"address",
"opening_hours"
]
}
+18
View File
@@ -0,0 +1,18 @@
{
"name": "place",
"match": {
"type": [
"point",
"area"
],
"tags": {
"place": "*"
}
},
"form": [
{
"key": "place",
"type": "combo"
}
]
}
+13
View File
@@ -0,0 +1,13 @@
{
"name": "hamlet",
"match": {
"type": [
"point",
"area"
],
"tags": {
"place": "hamlet"
}
},
"icon": "triangle-stroked"
}
+1 -2
View File
@@ -18,6 +18,5 @@
"tags": {
"place": "island"
}
},
"icon": ""
}
}
+13
View File
@@ -0,0 +1,13 @@
{
"name": "locality",
"match": {
"type": [
"point",
"area"
],
"tags": {
"place": "locality"
}
},
"icon": "marker"
}
+13
View File
@@ -0,0 +1,13 @@
{
"name": "village",
"match": {
"type": [
"point",
"area"
],
"tags": {
"place": "village"
}
},
"icon": "square-stroked"
}
+20
View File
@@ -0,0 +1,20 @@
{
"name": "railway",
"match": {
"type": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"railway": "*"
}
},
"form": [
{
"key": "railway",
"type": "combo"
}
]
}
+22
View File
@@ -0,0 +1,22 @@
{
"name": "shop",
"match": {
"type": [
"point",
"area"
],
"tags": {
"shop": "*"
},
"terms": []
},
"icon": "shop",
"form": [
{
"key": "shop",
"type": "combo"
},
"address",
"opening_hours"
]
}
+18
View File
@@ -0,0 +1,18 @@
{
"name": "tourism",
"match": {
"type": [
"point",
"area"
],
"tags": {
"tourism": "*"
}
},
"form": [
{
"key": "tourism",
"type": "combo"
}
]
}
@@ -0,0 +1,19 @@
{
"name": "camp site",
"match": {
"type": [
"point",
"area"
],
"terms": [
],
"tags": {
"tourism": "camp_site"
}
},
"icon": "campsite",
"form": [
"operator",
"address"
]
}
@@ -11,7 +11,6 @@
"tourism": "picnic_site"
}
},
"icon": "",
"form": [
"operator",
"building_area",
+20
View File
@@ -0,0 +1,20 @@
{
"name": "waterway",
"match": {
"type": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"waterway": "*"
}
},
"form": [
{
"key": "waterway",
"type": "combo"
}
]
}
+12
View File
@@ -0,0 +1,12 @@
{
"name": "canal",
"match": {
"type": [
"line"
],
"tags": {
"waterway": "canal"
}
},
"icon": "waterway-river"
}
+15
View File
@@ -0,0 +1,15 @@
{
"name": "dam",
"match": {
"type": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"waterway": "dam"
}
},
"icon": "dam"
}
+12
View File
@@ -0,0 +1,12 @@
{
"name": "ditch",
"match": {
"type": [
"line"
],
"tags": {
"waterway": "ditch"
}
},
"icon": "waterway-river"
}
+12
View File
@@ -0,0 +1,12 @@
{
"name": "drain",
"match": {
"type": [
"line"
],
"tags": {
"waterway": "drain"
}
},
"icon": "waterway-river"
}
@@ -0,0 +1,12 @@
{
"name": "riverbank",
"match": {
"type": [
"area"
],
"tags": {
"waterway": "riverbank"
}
},
"icon": "water"
}

Some files were not shown because too many files have changed in this diff Show More