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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Benoit Costamagna
2018-01-18 07:48:32 +01:00
parent bdbc63b1c1 9bbb5db5ef
commit 1c4d2e5bcf
9 changed files with 83 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+5 -2
View File
@@ -1145,6 +1145,9 @@ en:
ref:
# ref=*
label: Reference Code
ref/isil:
# 'ref:isil=*'
label: ISIL Code
ref_aeroway_gate:
# ref=*
label: Gate Number
@@ -3410,8 +3413,8 @@ en:
terms: '<translate with synonyms or related terms for ''Forest'', separated by commas>'
landuse/garages:
# landuse=garages
name: Garages
terms: '<translate with synonyms or related terms for ''Garages'', separated by commas>'
name: Garage Landuse
terms: '<translate with synonyms or related terms for ''Garage Landuse'', separated by commas>'
landuse/grass:
# landuse=grass
name: Grass
data/presets/fields.json
+5
View File
@@ -1571,6 +1571,11 @@
"type": "text",
"label": "Reference Code"
},
"ref/isil": {
"key": "ref:isil",
"type": "text",
"label": "ISIL Code"
},
"relation": {
"key": "type",
"type": "combo",
data/presets/fields/ref/isil.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "ref:isil",
"type": "text",
"label": "ISIL Code"
}
data/presets/presets.json
+51 -25
View File
@@ -1882,7 +1882,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"geometry": [
"point",
@@ -8413,7 +8414,7 @@
"landuse": "garages"
},
"terms": [],
"name": "Garages"
"name": "Garage Landuse"
},
"landuse/grass": {
"geometry": [
@@ -18512,6 +18513,8 @@
"tourism/information/guidepost": {
"icon": "information",
"fields": [
"name",
"elevation",
"operator",
"ref"
],
@@ -44430,7 +44433,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44453,7 +44457,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44476,7 +44481,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44499,7 +44505,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44522,7 +44529,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44545,7 +44553,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44568,7 +44577,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44591,7 +44601,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44614,7 +44625,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44637,7 +44649,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44660,7 +44673,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44683,7 +44697,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44706,7 +44721,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44729,7 +44745,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44752,7 +44769,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44775,7 +44793,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44798,7 +44817,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44821,7 +44841,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44844,7 +44865,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44867,7 +44889,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44890,7 +44913,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44913,7 +44937,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
@@ -44936,7 +44961,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"suggestion": true
},
data/presets/presets/amenity/library.json
+2 -1
View File
@@ -8,7 +8,8 @@
"opening_hours",
"internet_access",
"internet_access/fee",
"internet_access/ssid"
"internet_access/ssid",
"ref/isil"
],
"geometry": [
"point",
data/presets/presets/landuse/garages.json
+1 -1
View File
@@ -9,5 +9,5 @@
"landuse": "garages"
},
"terms": [],
"name": "Garages"
"name": "Garage Landuse"
}
data/presets/presets/tourism/information/guidepost.json
+2
View File
@@ -1,6 +1,8 @@
{
"icon": "information",
"fields": [
"name",
"elevation",
"operator",
"ref"
],
dist/locales/en.json
Vendored
+4 -1
View File
@@ -2249,6 +2249,9 @@
"ref": {
"label": "Reference Code"
},
"ref/isil": {
"label": "ISIL Code"
},
"relation": {
"label": "Type"
},
@@ -4254,7 +4257,7 @@
"terms": "tree"
},
"landuse/garages": {
"name": "Garages",
"name": "Garage Landuse",
"terms": ""
},
"landuse/grass": {
modules/modes/select.js
+8 -8
View File
@@ -248,13 +248,13 @@ export function modeSelect(context, selectedIDs) {
var target = d3_select(d3_event.target);
var datum = target.datum();
var entity = datum && datum.id && context.hasEntity(datum.id);
if (entity) datum = entity;
var entity = datum && datum.properties && datum.properties.entity;
if (!entity) return;
if (datum instanceof osmWay && target.classed('target')) {
var choice = geoChooseEdge(context.childNodes(datum), context.mouse(), context.projection);
var prev = datum.nodes[choice.index - 1];
var next = datum.nodes[choice.index];
if (entity instanceof osmWay && target.classed('target')) {
var choice = geoChooseEdge(context.childNodes(entity), context.mouse(), context.projection);
var prev = entity.nodes[choice.index - 1];
var next = entity.nodes[choice.index];
context.perform(
actionAddMidpoint({loc: choice.loc, edge: [prev, next]}, osmNode()),
@@ -264,9 +264,9 @@ export function modeSelect(context, selectedIDs) {
d3_event.preventDefault();
d3_event.stopPropagation();
} else if (datum.type === 'midpoint') {
} else if (entity.type === 'midpoint') {
context.perform(
actionAddMidpoint({loc: datum.loc, edge: datum.edge}, osmNode()),
actionAddMidpoint({loc: entity.loc, edge: entity.edge}, osmNode()),
t('operations.add.annotation.vertex'));
d3_event.preventDefault();