From 72bc3a5476632ef9867eded69eeb68a79ae66ade Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 28 Aug 2013 09:42:29 -0700 Subject: [PATCH] Move up maxspeed field (fixes #1763) --- data/presets/presets.json | 32 +++++++++---------- .../presets/highway/living_street.json | 2 +- data/presets/presets/highway/motorway.json | 2 +- .../presets/highway/motorway_link.json | 2 +- data/presets/presets/highway/primary.json | 2 +- .../presets/presets/highway/primary_link.json | 2 +- data/presets/presets/highway/residential.json | 2 +- data/presets/presets/highway/road.json | 2 +- data/presets/presets/highway/secondary.json | 2 +- .../presets/highway/secondary_link.json | 2 +- data/presets/presets/highway/service.json | 2 +- data/presets/presets/highway/tertiary.json | 2 +- .../presets/highway/tertiary_link.json | 2 +- data/presets/presets/highway/track.json | 2 +- data/presets/presets/highway/trunk.json | 2 +- data/presets/presets/highway/trunk_link.json | 2 +- .../presets/presets/highway/unclassified.json | 2 +- dist/locales/en.json | 2 +- 18 files changed, 33 insertions(+), 33 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 9fb7ff614..d5033ad62 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1712,9 +1712,9 @@ "icon": "highway-living-street", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ @@ -1741,10 +1741,10 @@ "icon": "highway-motorway", "fields": [ "oneway", + "maxspeed", "structure", "access", "lanes", - "maxspeed", "surface", "ref" ], @@ -1773,9 +1773,9 @@ "icon": "highway-motorway-link", "fields": [ "oneway_yes", + "maxspeed", "structure", "access", - "maxspeed", "surface", "ref" ], @@ -1832,10 +1832,10 @@ "icon": "highway-primary", "fields": [ "oneway", + "maxspeed", "structure", "access", "lanes", - "maxspeed", "surface", "ref" ], @@ -1852,9 +1852,9 @@ "icon": "highway-primary-link", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface", "ref" ], @@ -1875,9 +1875,9 @@ "icon": "highway-residential", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ @@ -1893,9 +1893,9 @@ "icon": "highway-road", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ @@ -1911,10 +1911,10 @@ "icon": "highway-secondary", "fields": [ "oneway", + "maxspeed", "structure", "access", "lanes", - "maxspeed", "surface", "ref" ], @@ -1931,9 +1931,9 @@ "icon": "highway-secondary-link", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface", "ref" ], @@ -1955,9 +1955,9 @@ "fields": [ "service", "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ @@ -2071,10 +2071,10 @@ "icon": "highway-tertiary", "fields": [ "oneway", + "maxspeed", "structure", "access", "lanes", - "maxspeed", "surface", "ref" ], @@ -2091,9 +2091,9 @@ "icon": "highway-tertiary-link", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface", "ref" ], @@ -2115,9 +2115,9 @@ "fields": [ "tracktype", "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ @@ -2147,10 +2147,10 @@ "icon": "highway-trunk", "fields": [ "oneway", + "maxspeed", "structure", "access", "lanes", - "maxspeed", "surface", "ref" ], @@ -2167,9 +2167,9 @@ "icon": "highway-trunk-link", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface", "ref" ], @@ -2201,9 +2201,9 @@ "icon": "highway-unclassified", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json index c0bd226c2..ac0202587 100644 --- a/data/presets/presets/highway/living_street.json +++ b/data/presets/presets/highway/living_street.json @@ -2,9 +2,9 @@ "icon": "highway-living-street", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json index cc1c8594c..d33aa952a 100644 --- a/data/presets/presets/highway/motorway.json +++ b/data/presets/presets/highway/motorway.json @@ -2,10 +2,10 @@ "icon": "highway-motorway", "fields": [ "oneway", + "maxspeed", "structure", "access", "lanes", - "maxspeed", "surface", "ref" ], diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json index 7480eb667..72e5ffe62 100644 --- a/data/presets/presets/highway/motorway_link.json +++ b/data/presets/presets/highway/motorway_link.json @@ -2,9 +2,9 @@ "icon": "highway-motorway-link", "fields": [ "oneway_yes", + "maxspeed", "structure", "access", - "maxspeed", "surface", "ref" ], diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json index 2f95200c6..e09c87433 100644 --- a/data/presets/presets/highway/primary.json +++ b/data/presets/presets/highway/primary.json @@ -2,10 +2,10 @@ "icon": "highway-primary", "fields": [ "oneway", + "maxspeed", "structure", "access", "lanes", - "maxspeed", "surface", "ref" ], diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json index 3ac4a2d99..cff0de7fd 100644 --- a/data/presets/presets/highway/primary_link.json +++ b/data/presets/presets/highway/primary_link.json @@ -2,9 +2,9 @@ "icon": "highway-primary-link", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface", "ref" ], diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json index 72bf6334e..bca93dba5 100644 --- a/data/presets/presets/highway/residential.json +++ b/data/presets/presets/highway/residential.json @@ -2,9 +2,9 @@ "icon": "highway-residential", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ diff --git a/data/presets/presets/highway/road.json b/data/presets/presets/highway/road.json index bb74b6d0f..fa7963776 100644 --- a/data/presets/presets/highway/road.json +++ b/data/presets/presets/highway/road.json @@ -2,9 +2,9 @@ "icon": "highway-road", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json index 242da4e11..ed698a66f 100644 --- a/data/presets/presets/highway/secondary.json +++ b/data/presets/presets/highway/secondary.json @@ -2,10 +2,10 @@ "icon": "highway-secondary", "fields": [ "oneway", + "maxspeed", "structure", "access", "lanes", - "maxspeed", "surface", "ref" ], diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json index b52a193e4..56fcff64f 100644 --- a/data/presets/presets/highway/secondary_link.json +++ b/data/presets/presets/highway/secondary_link.json @@ -2,9 +2,9 @@ "icon": "highway-secondary-link", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface", "ref" ], diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json index 9be64c150..c379d2997 100644 --- a/data/presets/presets/highway/service.json +++ b/data/presets/presets/highway/service.json @@ -3,9 +3,9 @@ "fields": [ "service", "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json index 0217dd5c8..2cdaa3800 100644 --- a/data/presets/presets/highway/tertiary.json +++ b/data/presets/presets/highway/tertiary.json @@ -2,10 +2,10 @@ "icon": "highway-tertiary", "fields": [ "oneway", + "maxspeed", "structure", "access", "lanes", - "maxspeed", "surface", "ref" ], diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json index 5f2436bd2..72cc6d9fa 100644 --- a/data/presets/presets/highway/tertiary_link.json +++ b/data/presets/presets/highway/tertiary_link.json @@ -2,9 +2,9 @@ "icon": "highway-tertiary-link", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface", "ref" ], diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json index acc204dca..c0db026b1 100644 --- a/data/presets/presets/highway/track.json +++ b/data/presets/presets/highway/track.json @@ -3,9 +3,9 @@ "fields": [ "tracktype", "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json index 66e105be5..bd39ee073 100644 --- a/data/presets/presets/highway/trunk.json +++ b/data/presets/presets/highway/trunk.json @@ -2,10 +2,10 @@ "icon": "highway-trunk", "fields": [ "oneway", + "maxspeed", "structure", "access", "lanes", - "maxspeed", "surface", "ref" ], diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json index 2bc192c16..2993c7c48 100644 --- a/data/presets/presets/highway/trunk_link.json +++ b/data/presets/presets/highway/trunk_link.json @@ -2,9 +2,9 @@ "icon": "highway-trunk-link", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface", "ref" ], diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json index b8dc36200..8b49c9092 100644 --- a/data/presets/presets/highway/unclassified.json +++ b/data/presets/presets/highway/unclassified.json @@ -2,9 +2,9 @@ "icon": "highway-unclassified", "fields": [ "oneway", + "maxspeed", "structure", "access", - "maxspeed", "surface" ], "geometry": [ diff --git a/dist/locales/en.json b/dist/locales/en.json index e57b6866c..4fbda0bf3 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -313,7 +313,7 @@ "help": { "title": "Help", "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 a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/systemed/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\nMultiple features can be selected by holding the 'Shift' key, clicking,\nand dragging on the map. This will select all features within the box\nthat's drawn, allowing you to do things with several features at once.\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", + "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", "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\nGPS data is the most trusted 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[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\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 green\nline. Click on the 'Background Settings' menu on the left 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.\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 left.\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",