CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 09:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add intermittent checkbox field, and Intermittent Stream preset

Browse Source
This commit is contained in:
Bryan Housel
2017-09-11 14:04:09 -04:00
parent 0f153d7d55
commit fec27a04d3
18 changed files with 172 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/presets.yaml
View File

@@ -630,6 +630,9 @@ en:
inscription:
# inscription=*
label: Inscription
intermittent:
# intermittent=*
label: Intermittent
internet_access:
# internet_access=*
label: Internet Access
@@ -4876,6 +4879,11 @@ en:
name: Stream
# 'terms: beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse'
terms: '<translate with synonyms or related terms for ''Stream'', separated by commas>'
waterway/stream_intermittent:
# 'waterway=stream, intermittent=yes'
name: Intermittent Stream
# 'terms: arroyo,beck,branch,brook,burn,course,creek,drift,flood,flow,gully,run,runnel,rush,spate,spritz,tributary,wadi,wash,watercourse'
terms: '<translate with synonyms or related terms for ''Intermittent Stream'', separated by commas>'
waterway/water_point:
# waterway=water_point
name: Marine Drinking Water

5
data/presets/fields.json
View File

@@ -875,6 +875,11 @@
"type": "textarea",
"label": "Inscription"
},
"intermittent": {
"key": "intermittent",
"type": "check",
"label": "Intermittent"
},
"internet_access": {
"key": "internet_access",
"type": "combo",

5
data/presets/fields/intermittent.json Normal file
View File

@@ -0,0 +1,5 @@
{
"key": "intermittent",
"type": "check",
"label": "Intermittent"
}

86
data/presets/presets.json
View File

@@ -10035,6 +10035,10 @@
},
"natural/spring": {
"icon": "water",
"fields": [
"name",
"intermittent"
],
"geometry": [
"point",
"vertex"
@@ -10112,12 +10116,13 @@
},
"natural/water/lake": {
"icon": "water",
"fields": [
"name",
"intermittent"
],
"geometry": [
"area"
],
"fields": [
"name"
],
"tags": {
"natural": "water",
"water": "lake"
@@ -10135,12 +10140,13 @@
},
"natural/water/pond": {
"icon": "water",
"fields": [
"name",
"intermittent"
],
"geometry": [
"area"
],
"fields": [
"name"
],
"tags": {
"natural": "water",
"water": "pond"
@@ -10160,12 +10166,13 @@
},
"natural/water/reservoir": {
"icon": "water",
"fields": [
"name",
"intermittent"
],
"geometry": [
"area"
],
"fields": [
"name"
],
"tags": {
"natural": "water",
"water": "reservoir"
@@ -15268,7 +15275,8 @@
"icon": "waterway-canal",
"fields": [
"name",
"width"
"width",
"intermittent"
],
"geometry": [
"line"
@@ -15297,7 +15305,8 @@
"waterway/ditch": {
"icon": "waterway-ditch",
"fields": [
"tunnel_waterway"
"tunnel_waterway",
"intermittent"
],
"geometry": [
"line"
@@ -15333,7 +15342,8 @@
"waterway/drain": {
"icon": "waterway-stream",
"fields": [
"tunnel_waterway"
"tunnel_waterway",
"intermittent"
],
"geometry": [
"line"
@@ -15372,7 +15382,8 @@
"fields": [
"name",
"tunnel_waterway",
"width"
"width",
"intermittent"
],
"geometry": [
"line"
@@ -15438,12 +15449,56 @@
},
"name": "Marine Toilet Disposal"
},
"waterway/stream_intermittent": {
"icon": "waterway-stream",
"fields": [
"name",
"tunnel_waterway",
"width",
"intermittent"
],
"geometry": [
"line"
],
"terms": [
"arroyo",
"beck",
"branch",
"brook",
"burn",
"course",
"creek",
"drift",
"flood",
"flow",
"gully",
"run",
"runnel",
"rush",
"spate",
"spritz",
"tributary",
"wadi",
"wash",
"watercourse"
],
"tags": {
"waterway": "stream",
"intermittent": "yes"
},
"reference": {
"key": "waterway",
"value": "stream"
},
"name": "Intermittent Stream"
},
"waterway/stream": {
"icon": "waterway-stream",
"fields": [
"name",
"tunnel_waterway",
"width"
"width",
"intermittent"
],
"geometry": [
"line"
@@ -15497,7 +15552,8 @@
"fields": [
"name",
"height",
"width"
"width",
"intermittent"
],
"geometry": [
"vertex"

4
data/presets/presets/natural/spring.json
View File

@@ -1,5 +1,9 @@
{
"icon": "water",
"fields": [
"name",
"intermittent"
],
"geometry": [
"point",
"vertex"

7
data/presets/presets/natural/water/lake.json
View File

@@ -1,11 +1,12 @@
{
"icon": "water",
"fields": [
"name",
"intermittent"
],
"geometry": [
"area"
],
"fields": [
"name"
],
"tags": {
"natural": "water",
"water": "lake"

7
data/presets/presets/natural/water/pond.json
View File

@@ -1,11 +1,12 @@
{
"icon": "water",
"fields": [
"name",
"intermittent"
],
"geometry": [
"area"
],
"fields": [
"name"
],
"tags": {
"natural": "water",
"water": "pond"

7
data/presets/presets/natural/water/reservoir.json
View File

@@ -1,11 +1,12 @@
{
"icon": "water",
"fields": [
"name",
"intermittent"
],
"geometry": [
"area"
],
"fields": [
"name"
],
"tags": {
"natural": "water",
"water": "reservoir"

2
data/presets/presets/waterway/boatyard.json
View File

@@ -1,7 +1,7 @@
{
"icon": "harbor",
"fields":[
"name",
"name",
"operator"
],
"geometry": [

3
data/presets/presets/waterway/canal.json
View File

@@ -2,7 +2,8 @@
"icon": "waterway-canal",
"fields": [
"name",
"width"
"width",
"intermittent"
],
"geometry": [
"line"

3
data/presets/presets/waterway/ditch.json
View File

@@ -1,7 +1,8 @@
{
"icon": "waterway-ditch",
"fields": [
"tunnel_waterway"
"tunnel_waterway",
"intermittent"
],
"geometry": [
"line"

3
data/presets/presets/waterway/drain.json
View File

@@ -1,7 +1,8 @@
{
"icon": "waterway-stream",
"fields": [
"tunnel_waterway"
"tunnel_waterway",
"intermittent"
],
"geometry": [
"line"

3
data/presets/presets/waterway/river.json
View File

@@ -3,7 +3,8 @@
"fields": [
"name",
"tunnel_waterway",
"width"
"width",
"intermittent"
],
"geometry": [
"line"

3
data/presets/presets/waterway/stream.json
View File

@@ -3,7 +3,8 @@
"fields": [
"name",
"tunnel_waterway",
"width"
"width",
"intermittent"
],
"geometry": [
"line"

43
data/presets/presets/waterway/stream_intermittent.json Normal file
View File

@@ -0,0 +1,43 @@
{
"icon": "waterway-stream",
"fields": [
"name",
"tunnel_waterway",
"width",
"intermittent"
],
"geometry": [
"line"
],
"terms": [
"arroyo",
"beck",
"branch",
"brook",
"burn",
"course",
"creek",
"drift",
"flood",
"flow",
"gully",
"run",
"runnel",
"rush",
"spate",
"spritz",
"tributary",
"wadi",
"wash",
"watercourse"
],
"tags": {
"waterway": "stream",
"intermittent": "yes"
},
"reference": {
"key": "waterway",
"value": "stream"
},
"name": "Intermittent Stream"
}

3
data/presets/presets/waterway/waterfall.json
View File

@@ -3,7 +3,8 @@
"fields": [
"name",
"height",
"width"
"width",
"intermittent"
],
"geometry": [
"vertex"

4
data/taginfo.json
View File

@@ -3062,6 +3062,10 @@
"key": "waterway",
"value": "sanitary_dump_station"
},
{
"key": "intermittent",
"value": "yes"
},
{
"key": "waterway",
"value": "stream"

7
dist/locales/en.json vendored
View File

@@ -1619,6 +1619,9 @@
"inscription": {
"label": "Inscription"
},
"intermittent": {
"label": "Intermittent"
},
"internet_access": {
"label": "Internet Access",
"options": {
@@ -5385,6 +5388,10 @@
"name": "Marine Toilet Disposal",
"terms": "Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump out,Elsan,CDP,CTDP,Chemical Toilet"
},
"waterway/stream_intermittent": {
"name": "Intermittent Stream",
"terms": "arroyo,beck,branch,brook,burn,course,creek,drift,flood,flow,gully,run,runnel,rush,spate,spritz,tributary,wadi,wash,watercourse"
},
"waterway/stream": {
"name": "Stream",
"terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse"