Merge pull request #384 from OpenHistoricalMap/id-2.29.6

incorporate our iD v2.29.6

Author: erictheise

app/assets/javascripts/index/query.js

@@ -100,7 +100,7 @@ OSM.Query = function (map) {
 
         if (prefixes[key]) {
           const first = value.slice(0, 1).toUpperCase(),
-            rest = value.slice(1).replace(/_/g, " ");
+                rest = value.slice(1).replace(/_/g, " ");
 
           return first + rest;
         }
@@ -162,7 +162,7 @@ OSM.Query = function (map) {
 
   function featureName(feature) {
     const tags = feature.tags,
-      localeKeys = OSM.preferred_languages.map(locale => `name:${locale}`);
+          localeKeys = OSM.preferred_languages.map(locale => `name:${locale}`);
 
     for (const key of [...localeKeys, "name", "ref", "addr:housename"]) {
       if (tags[key]) return tags[key];
@@ -338,19 +338,21 @@ OSM.Query = function (map) {
   /*
    * QUERY MECHANISM:
    *
-   * To find nearby objects we ask Overpass for the union of the following sets:
+   * To find nearby objects we ask overpass for the union of the
+   * following sets:
    *   node(around:<radius>,<lat>,<lng>)
    *   way(around:<radius>,<lat>,<lng>)
    *   relation(around:<radius>,<lat>,<lng>)
    *
-   * To find enclosing objects we first find all the enclosing areas:
+   * to find enclosing objects we first find all the enclosing areas:
    *   is_in(<lat>,<lng>)->.a
    *
    * and then return the union of the following sets:
    *   relation(pivot.a)
    *   way(pivot.a)
    *
-   * In both cases we then ask to retrieve tags and the geometry for each object.
+   * In both cases we then ask to retrieve tags and the geometry
+   * for each object.
    *
    * TEMPORAL FILTERING (OpenHistoricalMap - Added Feature):
    * Filter objects to only include those that existed at the time slider date.
@@ -368,13 +370,13 @@ OSM.Query = function (map) {
    */
   function queryOverpass(latlng) {
     const bounds = map.getBounds(),
-      zoom = map.getZoom(),
-      bbox = [bounds.getSouthWest(), bounds.getNorthEast()]
-        .map(c => OSM.cropLocation(c, zoom))
-        .join(),
-      geom = `geom(${bbox})`,
-      radius = 10 * Math.pow(1.5, 19 - zoom),
-      here = `(around:${radius},${latlng})`;
+          zoom = map.getZoom(),
+          bbox = [bounds.getSouthWest(), bounds.getNorthEast()]
+            .map(c => OSM.cropLocation(c, zoom))
+            .join(),
+          geom = `geom(${bbox})`,
+          radius = 10 * Math.pow(1.5, 19 - zoom),
+          here = `(around:${radius},${latlng})`;
 
     let dateFilter = "";  // OverpassQL filter (dates >= 1000 CE)
     let jsDateFilter = null;  // JavaScript filter (dates < 1000 CE)

app/controllers/searches/latlon_queries_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Searches
   class LatlonQueriesController < QueriesController
     def create

app/controllers/searches/nominatim_queries_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Searches
   class NominatimQueriesController < QueriesController
     require "date_range"

app/controllers/searches/nominatim_reverse_queries_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Searches
   class NominatimReverseQueriesController < QueriesController
     include NominatimMethods

app/controllers/searches/queries_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Searches
   class QueriesController < ApplicationController
     before_action :authorize_web

app/controllers/searches_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SearchesController < ApplicationController
   include NominatimMethods
 

vendor/assets/iD/iD.css.erb

@@ -699,6 +699,11 @@
     stroke-linecap: round;
     pointer-events: none;
 }
+.ideditor g.auxiliary path.preview {
+    stroke: #ccc;
+    stroke-width: 2;
+    stroke-dasharray: 8, 4;
+}
 
 /* Visual Diffs
 ------------------
@@ -1741,8 +1746,11 @@
 }
 
 /* steps */
-.ideditor .preset-icon .icon.tag-highway-steps,
 .ideditor .preset-icon .icon.tag-highway-ladder {
+    color: #6f1f1f;
+    fill: #fff;
+}
+.ideditor .preset-icon .icon.tag-highway-steps {
     color: #81d25c;
     fill: #fff;
 }
@@ -1761,10 +1769,12 @@
     stroke-linecap: round;
     stroke-dasharray: none;
 }
-.ideditor path.line.stroke.tag-highway-steps,
 .ideditor path.line.stroke.tag-highway-ladder,
-.ideditor .preset-icon-container path.line.casing.tag-highway-steps,
 .ideditor .preset-icon-container path.line.casing.tag-highway-ladder {
+    stroke: #6f1f1f;
+}
+.ideditor path.line.stroke.tag-highway-steps,
+.ideditor .preset-icon-container path.line.casing.tag-highway-steps {
     stroke: #81d25c;
 }
 .ideditor .preset-icon-container path.line.stroke.tag-highway-steps,
@@ -4640,21 +4650,28 @@
 
 /* Hide/Toggle collapsible sections (aka Disclosure)
 ------------------------------------------------------- */
+.ideditor summary.hide-toggle {
+    display: block;
+    list-style: none;
+    cursor: pointer;
+    color: var(--link-color);
+    font-size: 14px;
+    font-weight: bold;
+    line-height: 25px;
+}
+.ideditor details.disclosure-wrap[open] summary.hide-toggle {
+    margin-bottom: 10px;
+}
+.ideditor summary.hide-toggle::-webkit-details-marker {
+    display: none;
+}
 .ideditor .hide-toggle .icon.pre-text {
     vertical-align: middle;
     width: 16px;
     height: 16px;
     margin-top: -3px;
 }
 
-.ideditor a:visited.hide-toggle,
-.ideditor a.hide-toggle {
-    display: inline-block;
-    font-size: 14px;
-    font-weight: bold;
-    margin-bottom: 5px;
-}
-
 
 /* Sidebar / Inspector
 ------------------------------------------------------- */
@@ -5302,7 +5319,6 @@
 
 .ideditor .label-text .label-textannotation svg.icon {
     margin: 0 8px;
-    color: #333;
     opacity: 0.5;
     width: 14px;
     height: 14px;
@@ -5723,11 +5739,24 @@
     padding-left: 0;
     padding-right: 11px;
 }
+.ideditor .combobox-address-street-place .combobox-option,
+.ideditor .combobox-option.has-icon {
+    display: flex;
+    align-items: center;
+}
+.ideditor .combobox-option.has-icon .combobox-option-label {
+    display: flex;
+    align-items: center;
+}
 .ideditor .tag-value-icon .icon {
     width: 21px;
     height: 21px;
     margin: auto;
 }
+.ideditor .tag-value-icon .emoji {
+    font-size: 24px;
+    line-height: 24px;
+}
 .ideditor[dir='ltr'] .form-field-input-combo .tag-value-icon + input,
 .ideditor[dir='ltr'] .form-field-input-semicombo .input-wrap .tag-value-icon + input,
 .ideditor[dir='ltr'] .form-field-input-multicombo .input-wrap .tag-value-icon + input {
@@ -6303,6 +6332,9 @@
     border: 1px solid var(--border-color);
     border-radius: 0 0 4px 4px;
 }
+.ideditor div.combobox:has(.has-description) {
+    max-height: 400px;
+}
 
 .ideditor .combobox a {
     display: block;
@@ -6354,6 +6386,18 @@
     border-right: 5px solid transparent;
 }
 
+.ideditor .combobox .combobox-option.has-description {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+}
+.ideditor .combobox .combobox-option-description {
+    font-size: 11px;
+    line-height: 1.3;
+    opacity: 0.7;
+    white-space: normal;
+    padding-top: 2px;
+}
 .ideditor .combobox .combobox-option.raw-option {
     font-family: monospace;
     color: var(--text-color);
@@ -6796,21 +6840,35 @@
     font-weight: normal;
     padding-left: 10px;
 }
-.ideditor .section-raw-member-editor .member-row .member-entity-name.has-colour::before,
-.ideditor .section-raw-membership-editor .member-row .member-entity-name.has-colour::before,
-.ideditor .feature-list .entity-name.has-colour::before,
+
 .ideditor .combobox-parent-relation .has-colour::before {
     display: inline-block;
     content: '';
-    margin-left: -5px;
+    margin-left: 2px;
     margin-right: 5px;
     border-style: solid;
     border-width: 4px;
     border-radius: 4px;
     border-color: inherit;
 }
-.ideditor .combobox-parent-relation .has-colour::before  {
-    margin-left: 2px;
+.ideditor .section-raw-membership-editor .member-row img.member-entity-icon,
+.ideditor .section-raw-member-editor .member-row img.member-entity-icon {
+    display: inline-block;
+    width: auto;
+    height: 18px;
+    margin-left: 5px;
+    margin-bottom: -4.5px;
+}
+.ideditor .section-raw-membership-editor .member-row span.member-entity-ref-color,
+.ideditor .section-raw-member-editor .member-row span.member-entity-ref-color,
+.ideditor .feature-list .feature-list-item span.member-entity-ref-color {
+    display: inline-block;
+    margin-left: 5px;
+    margin-right: -5px;
+    border-style: solid;
+    border-width: 4px;
+    border-radius: 10px;
+    line-height: 10px;
 }
 
 .ideditor[dir='rtl'] .section-raw-member-editor .member-row .member-entity-name,
@@ -8294,7 +8352,7 @@
 
 /* Unstyle button fields */
 .ideditor .inspector-hover .form-field-input-radio label.active,
-.ideditor .inspector-hover .entity-editor-pane a.hide-toggle {
+.ideditor .inspector-hover .entity-editor-pane summary.hide-toggle {
     opacity: 1;
     background-color: transparent;
     color: var(--passive-text-color);
@@ -9173,8 +9231,7 @@
     margin-top: 0;
 }
 
-.ideditor .community-detail a.hide-toggle,
-.ideditor .community-detail a:visited.hide-toggle {
+.ideditor .community-detail summary.hide-toggle {
     font-size: 12px;
     font-weight: normal;
     padding-bottom: 0;