Commit Graph

774 Commits

Author SHA1 Message Date
Minh Nguyễn
a178c67e31 Run make for taginfo.json and presets.json
Follow-up to 80d4a3bf32.
2015-05-01 01:18:20 -04:00
Minh Nguyễn
80d4a3bf32 Corrected oil well preset tag 2015-05-01 01:12:57 -04:00
Bryan Housel
2a951057b8 make translations 2015-04-30 14:13:59 -04:00
Bryan Housel
e161c9f2c6 run make for taginfo.json and presets.json 2015-04-30 14:09:23 -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
Martin Raifer
d2a05f5418 update imagery data (basemap.at doesn't support .jpeg anymore, only .png) 2015-04-28 15:46:44 +02: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
Jóhannes Birgir Jensson
498741fb9c Fixed icon for farm 2015-04-22 19:47:24 +00:00
Jóhannes Birgir Jensson
ede8d816bf fixed indent for farm 2015-04-22 19:46:25 +00:00
Jóhannes Birgir Jensson
33f8f205ab Added farm as preset for Place
Place=farm has over 26 thousand entries so far
2015-04-22 19:41:44 +00:00
Bryan Housel
995a9f4d50 Label commit message as "Changeset comment" (closes #2600) 2015-04-22 12:07:11 -04:00
Olaf Veerman
89b354ddba Allow overzoom to be set on overlays
The default behaviour is to overzoom overlays past their max
scaleExtent. When 'overzoom':false is defined in imagery.json,
the layer will disappear on the max scaleExtent.
2015-03-26 12:04:54 -07:00
John Firebaugh
b6a3e8a58c login ⇢ log in 2015-03-24 12:44:45 -07:00
Harkirat Singh
643370de34 fixes issue #2504 2015-03-25 00:27:48 +05:30
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
dffff73d39 Use combo not checkbox for building field (fixes #2553) 2015-03-18 10:25:59 -04:00
Bryan Housel
def08cab23 Tag motorway_link with explicit oneway=yes (closes #2555) 2015-03-17 09:51:42 -04:00
Bryan Housel
50a3fe320e Add service field for railways (closes #2552) 2015-03-12 14:33:06 -04:00
Bryan Housel
20943cf3a9 rebuild presets.json 2015-03-09 17:29:01 -04:00
Éric Gillet
b71261e39a Add/Prioritize network tag in public_transport 2015-03-08 20:17:27 +01: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
Bryan Housel
d755145ae6 WIP: usernames in messages, show # of total 2015-02-14 11:20:19 -05:00
Bryan Housel
0b083f60b7 Switch landuse=farm to landuse=farmland in category list
(re: #2478)
2015-02-13 12:22:43 -05:00
Bryan Housel
60410f7ee7 Remove point, vertex from generic landuse preset
(closes #2530)
2015-02-13 12:12:58 -05:00
Richard Fairhurst
0953475f04 Don't delete ways from route/boundary relations 2015-02-12 10:21:23 -08:00
Bryan Housel
5812663134 Update imagery 2015-02-09 20:48:28 -05:00
Bryan Housel
e98b822b05 Update translations 2015-02-09 20:47:40 -05:00
samanpwbb
cef46853ea rework list interactions 2015-02-09 15:20:29 -05:00
samanpwbb
e49ebe2784 rework save UI 2015-02-09 14:28:55 -05:00
Bryan Housel
65425cb738 Fix typo in smoothness.json: should be "impassable"
(closes #2523)
2015-02-09 13:22:22 -05:00
samanpwbb
d141827c3e Merge branch 'master' into conflict-resolution-ui 2015-02-06 19:08:50 -05:00
samanpwbb
78e4271071 finish basic layout/style pass 2015-02-06 19:07:57 -05:00
Bryan Housel
3b88fe999b Change description for amenity=farm to "Farmland" 2015-02-03 12:42:36 -05:00
Bryan Housel
62c9afcd2d Add gender field to amenity=toilets (closes #2422) 2015-02-03 12:36:25 -05:00
Bryan Housel
487130329d Updates to landuse presets (closes #2518)
* Do not support `landuse=*` on nodes anymore
* Add "Area" to description for `residential`, `commercial`, `industrial`, `retail`
2015-02-03 11:12:44 -05:00
Bryan Housel
b07f205db9 should be shop=houseware, not shop=household (closes #2509) 2015-02-03 10:48:40 -05:00
Bryan Housel
3bc98bec58 Update tree and forest presets
(closes #2512)

for `natural=tree`, `natural=wood`, `landuse=forest`
deprecate keys `type` and `wood`
now use keys `leaf_type`, `leaf_cycle`
2015-01-24 23:16:11 -05:00
Bryan Housel
32007fc814 Add shop=household preset
(closes #2509)
2015-01-24 22:48:42 -05:00