Merge pull request #1 from openstreetmap/master

Merge openstreetmap/iD into hikemaniac/iD
openstreetmap · Feb 26, 2018 · a37f705 · a37f705
2 parents 0348f9f + 63a4195
commit a37f705
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 12 deletions.
diff --git a/css/80_app.css b/css/80_app.css
@@ -1883,7 +1883,7 @@ input[type=number] {
 div.combobox {
     z-index: 9999;
     display: none;
-    box-shadow: 0 0 10px 0 rgba(0,0,0,.1);
+    box-shadow: 0 4px 10px 1px rgba(0,0,0,.2);
     margin-top: -1px;
     background: white;
     max-height: 120px;
@@ -1896,7 +1896,7 @@ div.combobox {
 .combobox a {
     display: block;
     padding: 5px 10px;
-    border-top:1px solid #ccc;
+    border-top: 1px solid #ccc;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
@@ -1909,6 +1909,7 @@ div.combobox {
 
 .combobox a:first-child {
     border-top: 0;
+    padding: 4px 10px;
 }
 
 .combobox-caret {

diff --git a/data/presets.yaml b/data/presets.yaml
@@ -1622,7 +1622,7 @@ en:
         label: Wheelchair Access
       wholesale:
         # wholesale=*
-        label: wholesale
+        label: Wholesale
       width:
         # width=*
         label: Width (Meters)

diff --git a/data/presets/fields.json b/data/presets/fields.json
@@ -2205,7 +2205,7 @@
         "wholesale": {
             "key": "wholesale",
             "type": "typeCombo",
-            "label": "wholesale"
+            "label": "Wholesale"
         },
         "width": {
             "key": "width",

diff --git a/data/presets/fields/wholesale.json b/data/presets/fields/wholesale.json
@@ -1,5 +1,5 @@
 {
     "key": "wholesale",
     "type": "typeCombo",
-    "label": "wholesale"
-}
+    "label": "Wholesale"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
@@ -5207,6 +5207,7 @@
             "tags": {
                 "craft": "boatbuilder"
             },
+            "matchScore": 0.4,
             "name": "Boat Builder"
         },
         "craft/bookbinder": {
@@ -8241,6 +8242,8 @@
             "icon": "landmark",
             "fields": [
                 "name",
+                "religion",
+                "denomination",
                 "inscription"
             ],
             "geometry": [

diff --git a/data/presets/presets/craft/boatbuilder.json b/data/presets/presets/craft/boatbuilder.json
@@ -14,5 +14,6 @@
     "tags": {
         "craft": "boatbuilder"
     },
+    "matchScore": 0.4,
     "name": "Boat Builder"
 }
diff --git a/data/presets/presets/historic/wayside_shrine.json b/data/presets/presets/historic/wayside_shrine.json
@@ -2,6 +2,8 @@
     "icon": "landmark",
     "fields": [
         "name",
+        "religion",
+        "denomination",
         "inscription"
     ],
     "geometry": [

diff --git a/dist/locales/en.json b/dist/locales/en.json
@@ -2643,7 +2643,7 @@
                     "label": "Wheelchair Access"
                 },
                 "wholesale": {
-                    "label": "wholesale"
+                    "label": "Wholesale"
                 },
                 "width": {
                     "label": "Width (Meters)"

diff --git a/modules/lib/d3.combobox.js b/modules/lib/d3.combobox.js
@@ -265,8 +265,8 @@ export function d3combobox() {
             var rect = node.getBoundingClientRect();
 
             wrapper
-                .style('left', rect.left + 'px')
-                .style('width', rect.width + 'px')
+                .style('left', (rect.left + 5) + 'px')
+                .style('width', (rect.width - 10) + 'px')
                 .style('top', rect.height + rect.top + 'px');
         }
 

diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js
@@ -491,7 +491,7 @@ export default {
     hideViewer: function() {
         _mlySelectedImage = null;
 
-        if (!_mlyFallback) {
+        if (!_mlyFallback && _mlyViewer) {
             _mlyViewer.getComponent('sequence').stop();
         }
 

diff --git a/modules/svg/gpx.js b/modules/svg/gpx.js
@@ -110,7 +110,10 @@ export function svgGpx(projection, context, dispatch) {
                 .attr('class', textClass)
                 .merge(labels)
                 .text(function(d) {
-                    return d.properties.desc || d.properties.name;
+                    if (d.properties) {
+                        return d.properties.desc || d.properties.name;
+                    }
+                    return null;
                 })
                 .attr('x', function(d) {
                     var centroid = getPath.centroid(d);

diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@mapbox/maki": "^4.0.0",
-    "@std/esm": "^0.21.0",
+    "@std/esm": "^0.22.0",
     "chai": "^4.1.0",
     "colors": "^1.1.2",
     "concat-files": "^0.1.1",