diff --git a/data/address-formats.json b/data/address-formats.json index 0589f566b..0c7cd0f19 100644 --- a/data/address-formats.json +++ b/data/address-formats.json @@ -23,12 +23,19 @@ ["postcode"] ] }, + { + "countryCodes": ["at", "ch", "de"], + "format": [ + ["street", "housenumber"], + ["postcode", "city"] + ] + }, { "countryCodes": [ - "ad", "at", "ba", "be", "ch", "cz", - "de", "dk", "es", "fi", "gr", "hr", - "is", "it", "li", "nl", "no", "pl", - "pt", "se", "si", "sk", "sm", "va" + "ad", "ba", "be", "cz", "dk", "es", + "fi", "gr", "hr", "is", "it", "li", + "nl", "no", "pl", "pt", "se", "si", + "sk", "sm", "va" ], "format": [ ["unit","street", "housenumber"], diff --git a/data/core.yaml b/data/core.yaml index 9f45ae26c..902a4e78c 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -564,8 +564,8 @@ en: details about it, and show a menu of things you can do with the feature. To select multiple features, hold down the 'Shift' key. Then either click - on the features you want to select, or drag on the map to draw a rectangle. - This will draw a box and select all the points within it. + on the features you want to select, or drag on the map to draw a contour + around those features. All the points inside the lasso area will be selected. ### Saving Edits diff --git a/data/phone-formats.json b/data/phone-formats.json index 9e6316469..2d7753faf 100644 --- a/data/phone-formats.json +++ b/data/phone-formats.json @@ -54,6 +54,9 @@ "cn": "+86 10 12345678", "tw": "+886 1 2345 6789", "tr": "+90 312 123 4567", - "ua": "+380 44 123 4567" + "ua": "+380 44 123 4567", + "at": "+43 1 123 45 67", + "ci": "+225 20 12 34 56", + "bj": "+229 20 12 34 56" } } diff --git a/data/presets.yaml b/data/presets.yaml index ec6d06ea9..515ee0ca5 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -452,6 +452,11 @@ en: drive_through: # drive_through=* label: Drive-Through + duration: + # duration=* + label: Duration + # duration field placeholder + placeholder: '00:00' electrified: # electrified=* label: Electrification @@ -2679,11 +2684,21 @@ en: # 'highway=footway, footway=crossing' name: Street Crossing terms: '' + footway/crossing-raised: + # 'highway=footway, footway=crossing, traffic_calming=table' + name: Raised Street Crossing + # 'terms: flat top,hump,speed,slow' + terms: '' footway/crosswalk: # 'highway=footway, footway=crossing, crossing=zebra' name: Pedestrian Crosswalk # 'terms: zebra crossing' terms: '' + footway/crosswalk-raised: + # 'highway=footway, footway=crossing, crossing=zebra, traffic_calming=table' + name: Raised Pedestrian Crosswalk + # 'terms: zebra crossing,flat top,hump,speed,slow' + terms: '' footway/sidewalk: # 'highway=footway, footway=sidewalk' name: Sidewalk @@ -2760,11 +2775,21 @@ en: # highway=crossing name: Street Crossing terms: '' + highway/crossing-raised: + # 'highway=crossing, traffic_calming=table' + name: Raised Street Crossing + # 'terms: flat top,hump,speed,slow' + terms: '' highway/crosswalk: # 'highway=crossing, crossing=zebra' name: Pedestrian Crosswalk # 'terms: zebra crossing' terms: '' + highway/crosswalk-raised: + # 'highway=crossing, crossing=zebra, traffic_calming=table' + name: Raised Pedestrian Crosswalk + # 'terms: zebra crossing,flat top,hump,speed,slow' + terms: '' highway/cycleway: # highway=cycleway name: Cycle Path @@ -4674,10 +4699,10 @@ en: # 'terms: audible lines,sleeper lines,growlers' terms: '' traffic_calming/table: - # 'highway=crossing, traffic_calming=table' - name: Raised Pedestrian Crossing + # traffic_calming=table + name: Speed Table # 'terms: flat top,hump,speed,slow' - terms: '' + terms: '' type/boundary: # type=boundary name: Boundary diff --git a/data/presets/fields.json b/data/presets/fields.json index c0541dc7b..cee4ba054 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -623,6 +623,12 @@ "type": "check", "label": "Drive-Through" }, + "duration": { + "key": "duration", + "type": "text", + "label": "Duration", + "placeholder": "00:00" + }, "electrified": { "key": "electrified", "type": "combo", diff --git a/data/presets/fields/duration.json b/data/presets/fields/duration.json new file mode 100644 index 000000000..5a3a3f1de --- /dev/null +++ b/data/presets/fields/duration.json @@ -0,0 +1,6 @@ +{ + "key": "duration", + "type": "text", + "label": "Duration", + "placeholder": "00:00" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index f7904185b..65fc02117 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -5745,9 +5745,36 @@ ], "name": "Entrance/Exit" }, + "footway/crossing-raised": { + "fields": [ + "crossing", + "access", + "surface", + "kerb", + "tactile_paving" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "footway", + "footway": "crossing", + "traffic_calming": "table" + }, + "reference": { + "key": "traffic_calming", + "value": "table" + }, + "terms": [ + "flat top", + "hump", + "speed", + "slow" + ], + "name": "Raised Street Crossing" + }, "footway/crossing": { "fields": [ - "name", "crossing", "access", "surface", @@ -5768,10 +5795,40 @@ "terms": [], "name": "Street Crossing" }, + "footway/crosswalk-raised": { + "icon": "highway-footway", + "fields": [ + "crossing", + "access", + "surface", + "kerb", + "tactile_paving" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "footway", + "footway": "crossing", + "crossing": "zebra", + "traffic_calming": "table" + }, + "reference": { + "key": "traffic_calming", + "value": "table" + }, + "terms": [ + "zebra crossing", + "flat top", + "hump", + "speed", + "slow" + ], + "name": "Raised Pedestrian Crosswalk" + }, "footway/crosswalk": { "icon": "highway-footway", "fields": [ - "name", "crossing", "access", "surface", @@ -5798,7 +5855,6 @@ "footway/sidewalk": { "icon": "highway-footway", "fields": [ - "name", "surface", "lit", "width", @@ -6098,9 +6154,33 @@ ], "name": "Indoor Corridor" }, + "highway/crossing-raised": { + "fields": [ + "crossing", + "kerb", + "tactile_paving" + ], + "geometry": [ + "vertex" + ], + "tags": { + "highway": "crossing", + "traffic_calming": "table" + }, + "reference": { + "key": "traffic_calming", + "value": "table" + }, + "terms": [ + "flat top", + "hump", + "speed", + "slow" + ], + "name": "Raised Street Crossing" + }, "highway/crossing": { "fields": [ - "name", "crossing", "kerb", "tactile_paving" @@ -6118,10 +6198,37 @@ "terms": [], "name": "Street Crossing" }, + "highway/crosswalk-raised": { + "icon": "poi-foot", + "fields": [ + "crossing", + "kerb", + "tactile_paving" + ], + "geometry": [ + "vertex" + ], + "tags": { + "highway": "crossing", + "crossing": "zebra", + "traffic_calming": "table" + }, + "reference": { + "key": "traffic_calming", + "value": "table" + }, + "terms": [ + "zebra crossing", + "flat top", + "hump", + "speed", + "slow" + ], + "name": "Raised Pedestrian Crosswalk" + }, "highway/crosswalk": { "icon": "poi-foot", "fields": [ - "name", "crossing", "kerb", "tactile_paving" @@ -6232,6 +6339,7 @@ "fields": [ "name", "oneway", + "maxspeed", "lanes", "surface", "structure", @@ -11464,7 +11572,10 @@ "line" ], "fields": [ - "name" + "name", + "operator", + "duration", + "access" ], "tags": { "route": "ferry" @@ -11636,7 +11747,6 @@ "icon": "shop", "fields": [ "name", - "artwork_type", "operator", "address", "building_area", @@ -14146,7 +14256,6 @@ "icon": "art-gallery", "fields": [ "name", - "artwork_type", "operator", "address", "building_area", @@ -14643,20 +14752,18 @@ "surface" ], "geometry": [ - "vertex", - "line" + "vertex" ], + "tags": { + "traffic_calming": "table" + }, "terms": [ "flat top", "hump", "speed", "slow" ], - "tags": { - "highway": "crossing", - "traffic_calming": "table" - }, - "name": "Raised Pedestrian Crossing" + "name": "Speed Table" }, "type/multipolygon": { "geometry": [ diff --git a/data/presets/presets/footway/crossing-raised.json b/data/presets/presets/footway/crossing-raised.json new file mode 100644 index 000000000..0ed1a2b50 --- /dev/null +++ b/data/presets/presets/footway/crossing-raised.json @@ -0,0 +1,28 @@ +{ + "fields": [ + "crossing", + "access", + "surface", + "kerb", + "tactile_paving" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "footway", + "footway": "crossing", + "traffic_calming": "table" + }, + "reference": { + "key": "traffic_calming", + "value": "table" + }, + "terms": [ + "flat top", + "hump", + "speed", + "slow" + ], + "name": "Raised Street Crossing" +} diff --git a/data/presets/presets/footway/crossing.json b/data/presets/presets/footway/crossing.json index 6726decff..293e22af8 100644 --- a/data/presets/presets/footway/crossing.json +++ b/data/presets/presets/footway/crossing.json @@ -1,6 +1,5 @@ { "fields": [ - "name", "crossing", "access", "surface", diff --git a/data/presets/presets/footway/crosswalk-raised.json b/data/presets/presets/footway/crosswalk-raised.json new file mode 100644 index 000000000..7d337fb37 --- /dev/null +++ b/data/presets/presets/footway/crosswalk-raised.json @@ -0,0 +1,31 @@ +{ + "icon": "highway-footway", + "fields": [ + "crossing", + "access", + "surface", + "kerb", + "tactile_paving" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "footway", + "footway": "crossing", + "crossing": "zebra", + "traffic_calming": "table" + }, + "reference": { + "key": "traffic_calming", + "value": "table" + }, + "terms": [ + "zebra crossing", + "flat top", + "hump", + "speed", + "slow" + ], + "name": "Raised Pedestrian Crosswalk" +} diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/footway/crosswalk.json index f77176c93..b4daf5f29 100644 --- a/data/presets/presets/footway/crosswalk.json +++ b/data/presets/presets/footway/crosswalk.json @@ -1,7 +1,6 @@ { "icon": "highway-footway", "fields": [ - "name", "crossing", "access", "surface", diff --git a/data/presets/presets/footway/sidewalk.json b/data/presets/presets/footway/sidewalk.json index ac14c8a24..f51b44cf9 100644 --- a/data/presets/presets/footway/sidewalk.json +++ b/data/presets/presets/footway/sidewalk.json @@ -1,7 +1,6 @@ { "icon": "highway-footway", "fields": [ - "name", "surface", "lit", "width", diff --git a/data/presets/presets/highway/crossing-raised.json b/data/presets/presets/highway/crossing-raised.json new file mode 100644 index 000000000..1b57fa04e --- /dev/null +++ b/data/presets/presets/highway/crossing-raised.json @@ -0,0 +1,25 @@ +{ + "fields": [ + "crossing", + "kerb", + "tactile_paving" + ], + "geometry": [ + "vertex" + ], + "tags": { + "highway": "crossing", + "traffic_calming": "table" + }, + "reference": { + "key": "traffic_calming", + "value": "table" + }, + "terms": [ + "flat top", + "hump", + "speed", + "slow" + ], + "name": "Raised Street Crossing" +} diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json index 87613d4bd..971062c98 100644 --- a/data/presets/presets/highway/crossing.json +++ b/data/presets/presets/highway/crossing.json @@ -1,6 +1,5 @@ { "fields": [ - "name", "crossing", "kerb", "tactile_paving" diff --git a/data/presets/presets/highway/crosswalk-raised.json b/data/presets/presets/highway/crosswalk-raised.json new file mode 100644 index 000000000..b5340ad3e --- /dev/null +++ b/data/presets/presets/highway/crosswalk-raised.json @@ -0,0 +1,28 @@ +{ + "icon": "poi-foot", + "fields": [ + "crossing", + "kerb", + "tactile_paving" + ], + "geometry": [ + "vertex" + ], + "tags": { + "highway": "crossing", + "crossing": "zebra", + "traffic_calming": "table" + }, + "reference": { + "key": "traffic_calming", + "value": "table" + }, + "terms": [ + "zebra crossing", + "flat top", + "hump", + "speed", + "slow" + ], + "name": "Raised Pedestrian Crosswalk" +} diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crosswalk.json index 787bbfb62..08dc6a3b1 100644 --- a/data/presets/presets/highway/crosswalk.json +++ b/data/presets/presets/highway/crosswalk.json @@ -1,7 +1,6 @@ { "icon": "poi-foot", "fields": [ - "name", "crossing", "kerb", "tactile_paving" diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json index d02655625..52f78ce74 100644 --- a/data/presets/presets/highway/living_street.json +++ b/data/presets/presets/highway/living_street.json @@ -3,6 +3,7 @@ "fields": [ "name", "oneway", + "maxspeed", "lanes", "surface", "structure", diff --git a/data/presets/presets/route/ferry.json b/data/presets/presets/route/ferry.json index 696a17b28..df152dcf0 100644 --- a/data/presets/presets/route/ferry.json +++ b/data/presets/presets/route/ferry.json @@ -4,7 +4,10 @@ "line" ], "fields": [ - "name" + "name", + "operator", + "duration", + "access" ], "tags": { "route": "ferry" diff --git a/data/presets/presets/shop/art.json b/data/presets/presets/shop/art.json index bc606392f..dd0c36e00 100644 --- a/data/presets/presets/shop/art.json +++ b/data/presets/presets/shop/art.json @@ -2,7 +2,6 @@ "icon": "shop", "fields": [ "name", - "artwork_type", "operator", "address", "building_area", diff --git a/data/presets/presets/tourism/gallery.json b/data/presets/presets/tourism/gallery.json index a08fd7ca1..30150ebf2 100644 --- a/data/presets/presets/tourism/gallery.json +++ b/data/presets/presets/tourism/gallery.json @@ -2,7 +2,6 @@ "icon": "art-gallery", "fields": [ "name", - "artwork_type", "operator", "address", "building_area", diff --git a/data/presets/presets/traffic_calming/table.json b/data/presets/presets/traffic_calming/table.json index 2c0b94a91..275adfff1 100644 --- a/data/presets/presets/traffic_calming/table.json +++ b/data/presets/presets/traffic_calming/table.json @@ -4,18 +4,16 @@ "surface" ], "geometry": [ - "vertex", - "line" + "vertex" ], + "tags": { + "traffic_calming": "table" + }, "terms": [ "flat top", "hump", "speed", "slow" ], - "tags": { - "highway":"crossing", - "traffic_calming": "table" - }, - "name": "Raised Pedestrian Crossing" + "name": "Speed Table" } diff --git a/data/taginfo.json b/data/taginfo.json index 8dd4037d3..f62a1070c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1133,10 +1133,18 @@ { "key": "entrance" }, + { + "key": "traffic_calming", + "value": "table" + }, { "key": "footway", "value": "crossing" }, + { + "key": "traffic_calming", + "value": "table" + }, { "key": "crossing", "value": "zebra" @@ -1205,10 +1213,18 @@ "key": "highway", "value": "corridor" }, + { + "key": "traffic_calming", + "value": "table" + }, { "key": "highway", "value": "crossing" }, + { + "key": "traffic_calming", + "value": "table" + }, { "key": "crossing", "value": "zebra" diff --git a/dist/locales/en.json b/dist/locales/en.json index 81b185744..12441b83f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -660,7 +660,7 @@ "title": "Help", "key": "H", "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need to\n[log in](https://www.openstreetmap.org/login).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n", - "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a rectangle.\nThis will draw a box and select all the points within it.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n\n### Using the editor\n\nYou can view a list of keyboard shortcuts by pressing the `?` key.\n", + "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a contour\naround those features. All the points inside the lasso area will be selected.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n\n### Using the editor\n\nYou can view a list of keyboard shortcuts by pressing the `?` key.\n", "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also click the 'Move' tool or press the `M` shortcut key to move the entire road at\none time, and then click again to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n", "gps": "# GPS\n\nCollected GPS traces are one valuable source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright purple\nline. Click on the 'Map Data' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n", "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the right.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n", @@ -1464,6 +1464,10 @@ "drive_through": { "label": "Drive-Through" }, + "duration": { + "label": "Duration", + "placeholder": "00:00" + }, "electrified": { "label": "Electrification", "placeholder": "Contact Line, Electrified Rail...", @@ -3425,10 +3429,18 @@ "name": "Entrance/Exit", "terms": "" }, + "footway/crossing-raised": { + "name": "Raised Street Crossing", + "terms": "flat top,hump,speed,slow" + }, "footway/crossing": { "name": "Street Crossing", "terms": "" }, + "footway/crosswalk-raised": { + "name": "Raised Pedestrian Crosswalk", + "terms": "zebra crossing,flat top,hump,speed,slow" + }, "footway/crosswalk": { "name": "Pedestrian Crosswalk", "terms": "zebra crossing" @@ -3497,10 +3509,18 @@ "name": "Indoor Corridor", "terms": "gallery,hall,hallway,indoor,passage,passageway" }, + "highway/crossing-raised": { + "name": "Raised Street Crossing", + "terms": "flat top,hump,speed,slow" + }, "highway/crossing": { "name": "Street Crossing", "terms": "" }, + "highway/crosswalk-raised": { + "name": "Raised Pedestrian Crosswalk", + "terms": "zebra crossing,flat top,hump,speed,slow" + }, "highway/crosswalk": { "name": "Pedestrian Crosswalk", "terms": "zebra crossing" @@ -5202,7 +5222,7 @@ "terms": "audible lines,sleeper lines,growlers" }, "traffic_calming/table": { - "name": "Raised Pedestrian Crossing", + "name": "Speed Table", "terms": "flat top,hump,speed,slow" }, "type/multipolygon": { diff --git a/modules/actions/reflect.js b/modules/actions/reflect.js index a28ea7d2d..9c01ebbfa 100644 --- a/modules/actions/reflect.js +++ b/modules/actions/reflect.js @@ -29,8 +29,8 @@ export function actionReflect(reflectIds, projection) { ssrAngle = 0, c1 = hull[0]; - for (var i = 0; i < hull.length - 1; i++) { - var c2 = hull[i + 1], + for (var i = 0; i <= hull.length - 1; i++) { + var c2 = (i === hull.length - 1) ? hull[0] : hull[i + 1], angle = Math.atan2(c2[1] - c1[1], c2[0] - c1[0]), poly = geoRotate(hull, -angle, centroid), extent = poly.reduce(function(extent, point) { diff --git a/package.json b/package.json index fa6630969..c1a2f1993 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ "devDependencies": { "brfs": "1.4.3", "chai": "^4.1.0", - "d3": "4.10.0", - "ecstatic": "^2.2.0", + "d3": "4.10.2", + "ecstatic": "^3.0.0", "editor-layer-index": "osmlab/editor-layer-index.git#gh-pages", "gaze": "^1.1.1", "eslint": "^4.3.0", @@ -50,7 +50,7 @@ "jsonschema": "^1.1.0", "json-stable-stringify": "^1.0.1", "@mapbox/maki": "^4.0.0", - "mapillary-js": "2.7.0", + "mapillary-js": "2.8.0", "minimist": "^1.2.0", "mocha": "^3.4.0", "mocha-phantomjs-core": "^2.1.0", @@ -59,7 +59,7 @@ "phantomjs-prebuilt": "~2.1.11", "request": "^2.81.0", "rollup": "0.45.2", - "rollup-plugin-commonjs": "8.1.1", + "rollup-plugin-commonjs": "8.2.1", "rollup-plugin-json": "2.2.0", "rollup-plugin-node-resolve": "3.0.0", "shelljs": "^0.7.5",