CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-01 17:03:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,583 Commits 2 Branches 0 Tags
4971a204094de667a88d2fa8eaa8fbb99eb184f3
Commit Graph

845 Commits

Author SHA1 Message Date
jmespadero
f422f73141 Added plant_nursery.json preset 2015-07-10 10:33:53 +02:00
Bryan Housel
ee00564a6c Add preset for area:highway=* (closes #2627) 2015-07-08 21:34:49 -04:00
Bryan Housel
d0cb74638f Add presets for Casino and Adult Gaming Center (closes #2684) 2015-07-08 21:18:49 -04:00
Minh Nguyễn
8da0226636 Additional terms for corridor 2015-07-05 10:54:54 -07:00
Bryan Housel
46812abd1b Restore complete list of keys for address preset (closes #2698) 2015-07-01 16:15:07 -04:00
Bryan Housel
4a480f63bb Attempt to make crossing/crosswalk less confusing 
re: https://lists.openstreetmap.org/pipermail/hot/2015-June/009578.html
 2015-06-30 23:24:04 -04:00
Bryan Housel
58cb66f472 Add highway=corridor and universal level field 
For now, `highway=corridor`:
  * styled like highway=pedestrian
  * and matches 'paths' feature filter.

(closes #2687, closes #2218)
 2015-06-30 22:02:22 -04:00
Bryan Housel
f2dea4eb3c Translatable options strings and fix recycling icon 2015-06-30 10:55:31 -04:00
Bryan Housel
70ad4e7d52 Merge branch 'recycling_type' of https://github.com/ebrelsford/iD into ebrelsford-recycling_type 2015-06-30 10:45:11 -04:00
Bryan Housel
720b26142f Presets (volcano, saddle, adit, tree_row) 
Squashed commit of the following:

commit a100cc377da4d0790582fb2bd69e691d99084f0c
Author: Bryan Housel <bryan@7thposition.com>
Date:   Tue Jun 30 10:26:12 2015 -0400

    run make

commit cedd5d1c3dd43576ee42a6ab211d2f26eaaa732c
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 18:53:36 2015 +0200

    Update volcano.json

commit 38c4a782f6941064f3c8132bce61896ea14e70e9
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 16:28:28 2015 +0200

    Solver problem in man_made/adit/depth

commit 5e6d35dc3ed822ff1716cf0c80e6606545e337bd
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 16:12:13 2015 +0200

    Solver problem in man_made/adit/resource

commit bb582143ce90ec00b5d2a7b1efd8fb2415cca16d
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 13:54:29 2015 +0200

    Revert changes to ES locale

commit 8537162ad1bc6f6377c90f41cd6f24c103561ca5
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 13:50:49 2015 +0200

    Some natural and man_made presets

commit 4c41d88f63950787ca5372414ebcda4609458d26
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Fri Jun 26 15:57:38 2015 +0200

    Some natural/* and man_made/* translations
 2015-06-30 10:27:24 -04:00
Eric Brelsford
dbaf8a1465 Add recycling_type preset field 
Fixes #2689
 2015-06-17 14:18:30 -04:00
Bryan Housel
6aa4b3a873 Merge branch 'keyboard_shortcuts' of https://github.com/rhokbrisbane/iD into rhokbrisbane-keyboard_shortcuts 2015-06-15 22:32:20 -04:00
Bryan Housel
641cf98e70 Add tooltip to minimap toggle control 2015-06-15 22:28:40 -04:00
Bryan Housel
26ca610d0d Merge branch 'add-task-outline-to-minimap' of https://github.com/rhokbrisbane/iD into rhokbrisbane-add-task-outline-to-minimap 2015-06-15 22:02:42 -04:00
Bryan Housel
fda8146972 Merge pull request #2686 from ebrelsford/cycleway-preset 
Add cycleway preset field for highways with bike lanes
 2015-06-15 21:35:03 -04:00
Eric Brelsford
1814133371 Remove dropdown to change cycleway on both sides 2015-06-15 13:23:16 -04:00
Rowan Hogan
bd5eb5e972 Adds minimap toggle to background menu. Also resolves CSS issue with GPX layer in minimap. 2015-06-14 11:11:56 +10:00
Rowan Hogan
29d4944970 Adds link to keyboard shortcuts reference in help. 2015-06-13 14:32:30 +10:00
Bryan Housel
c421e7ec28 make translations 2015-06-10 10:23:42 -04:00
Eric Brelsford
a5dfee71b1 Use "none" as cycleway field placeholder 
Ensure "no" is not saved to OSM
 2015-06-09 15:15:48 -04:00
Eric Brelsford
31c57c01ce Add cycleway preset for highways with bike lanes 2015-06-09 14:49:50 -04:00
Bryan Housel
4a47a73146 Add "water" to terms list for man_made=storage_tank 2015-05-28 14:04:24 -04:00
Bryan Housel
840e3727cb Add presets for man_made=storage_tank and silo (closes #2662) 2015-05-28 09:42:49 -04:00
Bryan Housel
f761ca1f91 Add RV/Marine toilet disposal presets and related fields (closes #2623) 2015-05-27 17:38:12 -04:00
Bryan Housel
43266a0c1f Add waterway=fuel marine fuel station preset (closes #2589) 2015-05-27 16:30:57 -04:00
Bryan Housel
5b0b810d68 Add preset for amenity=biergarten 🍻 (closes #2641) 2015-05-27 16:21:28 -04:00
tristen
6316e52b55 Merge pull request #2573 from openstreetmap/distance-measurement 
Infobox / distance measurement
 2015-05-27 11:11:03 -04:00
tristen
249125ce16 Tweaks to the infobox interface 
- Variable height depending on the context list
- Added width that alligns with the grid
- Re-use classnames shared by the interface
- Changes to the unit toggle
  -- Shortened name to current unit of measurement (Accounted for this change in i8n)
  -- Display as a button to match other toggle/button like elements in the interface
 2015-05-27 10:17:17 -04:00
Bryan Housel
1287e4cad9 Change distance-measurement hotkey to cmd-I 2015-05-26 12:27:50 -04:00
Bryan Housel
2a951057b8 make translations 2015-04-30 14:13:59 -04:00
Minh Nguyễn
df5ac3bc72 Added “petroleum well” to synonyms of oil well 2015-04-30 10:02:05 -04:00
Minh Nguyễn
97943aa39d Added oil well preset 
`man_made=petroleum_well`
 2015-04-30 09:55:56 -04:00
Minh Nguyễn
331c736a25 Added radio mast preset 
`man_made=mast`
 2015-04-28 01:02:00 -07:00
Bryan Housel
d61af929df Run make for farm preset 2015-04-22 20:38:24 -04:00
Bryan Housel
995a9f4d50 Label commit message as "Changeset comment" (closes #2600) 2015-04-22 12:07:11 -04:00
Bryan Housel
982276261e i18n for distance measurement widget 2015-04-01 21:00:37 -04:00
Bryan Housel
42efb9a475 make rebuilt en.json 2015-03-27 21:47:19 -04:00
Bryan Housel
cc9bcba4e6 Add drive_through preset to fast_food, atm, etc 
Thanks @brianegge (closes #2459)
 2015-03-18 10:50:00 -04:00
Bryan Housel
50a3fe320e Add service field for railways (closes #2552) 2015-03-12 14:33:06 -04:00
Bryan Housel
81798423c0 Add incline field for highway=steps (fixes #2456) 2015-03-06 10:08:33 -05:00
Bryan Housel
1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution 
Merge Conflict Resolution
 2015-03-05 19:49:15 -05:00
Bryan Housel
d4643b1b89 Change link text: "Or download your changes" 2015-03-05 19:47:48 -05:00
Bryan Housel
c503b9f96c fill remoteGraph with loadMultiple, finally do proper undeletion 2015-03-03 23:43:37 -05:00
Bryan Housel
e3139e250e improvements to iD.actions.MergeRemoteChanges 
* if remote entity is deleted, log to conflicts() array
* if remote tag was deleted, delete from tags (not set undefined)
* update tests..
 2015-03-02 13:07:24 -05:00
Bryan Housel
80f5f65f63 More bugfixes and style updates: 
* working Previous/Next buttons
* remove behaviors from save mode
  (users should not be moving nodes around or selecting at this point)
* clear hover before hovering next object
* enable save button and finished message after reviewing last conflict
* store users choice in __data__.chosen..
* default choices to `keep remote version`
* better message for delete conflicts
* fix undelete action to check localGraph (which will have the entity)
  instead of context.graph() (which may not)
 2015-02-27 15:45:43 -05:00
Bryan Housel
0ed12da6fa WIP: style, replace expand/contract list with prev/next buttons 2015-02-26 22:39:22 -05:00
Bryan Housel
2c860785f6 Fix areaKeys whitelist/blacklist and blacklist junction=roundabout 
(closes #2484)
 2015-02-24 12:25:51 -05:00
Bryan Housel
cdd0ca1acf WIP: Use history.perform/replace/pop instead of context.perform 
This means
* no more weird saves to localStoage of partially merged graphs
* pop cleanly cancels back to history state before merges happen
  (removed the annotated undo states)
 2015-02-17 00:47:12 -05:00
Bryan Housel
781db91fbc make clean to remove old chaintool field 2015-02-14 11:33:16 -05:00
Bryan Housel
b36c9df610 field service:bicycle:chaintool changed to chain_tool 
(re: #2497)
 2015-02-14 11:29:43 -05:00