John Firebaugh
f8a68c879f
Adjust tree for force-rebased entities
...
Previously, entities that already existed in the rtree prior to the rebase
option would end up duplicated in the tree afterward.
Fixes #2637
2015-05-09 14:38:41 -07:00
Bryan Housel
1a3e2c0ebf
1.7.2
2015-05-03 10:24:04 -04:00
Bryan Housel
9c4ac96f5f
Merge pull request #2621 from 1ec5/patch-1
...
Corrected oil well preset tag
2015-05-03 01:05:13 -04:00
Bryan Housel
d3f3c9a43f
Don't allow duplicate ids in multifetch request list
...
(closes #2626 )
2015-05-03 01:01:01 -04:00
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
84c2ff955d
A few more details about updating openstreetmap-website
2015-04-30 15:08:11 -04:00
Bryan Housel
12e4e60f45
1.7.1
2015-04-30 14:15:19 -04:00
Bryan Housel
2a951057b8
make translations
2015-04-30 14:13:59 -04:00
Bryan Housel
8eae273bde
Correctly restore new local childnodes when choosing "keep local"
2015-04-30 14:10:32 -04:00
Bryan Housel
bff8266f19
Load children into remotegraph before conflict checks
...
Because loadMultiple doesn't download /full like loadEntity,
need to also load children that aren't already being checked..
2015-04-30 14:10:20 -04:00
Bryan Housel
e161c9f2c6
run make for taginfo.json and presets.json
2015-04-30 14:09:23 -04:00
Bryan Housel
20489a8255
Merge pull request #2618 from 1ec5/1ec5-preset-oil-well
...
Added oil well preset
2015-04-30 14:00:09 -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
Bryan Housel
3c4bed1145
Merge pull request #2617 from species/master
...
fix: build.js tests wrong fields in validatePresetFields()
2015-04-30 00:22:00 -04:00
Bryan Housel
7adb0ddbfb
Smarter revert of new entities, more tests
...
re: #2611 , #537
2015-04-29 22:47:07 -04:00
Michael Maier
a540637d4d
fix: build.js tests wrong fields in validatePresetFields()
...
validatePresetFields() tested old fields from file, not newly aggregated ones
2015-04-30 02:36:51 +02:00
Bryan Housel
ca02cf4b96
Graph#revert accept id instead of entity ref
...
trivial test cases (revert across create/update/delete) all pass
2015-04-28 11:22:46 -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
Bryan Housel
d85e6c260e
Only check childnode versions of nodes that exist both locally and remote
...
The old code was causing false positives, flagging any added or removed
childnode as a conflict.
2015-04-28 09:37:52 -04:00
John Firebaugh
09012c00dc
Merge pull request #2613 from 1ec5/preset-mast
...
Radio mast preset
2015-04-28 09:09:55 -04:00
Minh Nguyễn
331c736a25
Added radio mast preset
...
`man_made=mast`
2015-04-28 01:02:00 -07:00
Bryan Housel
c7c7dddf71
Merge pull request #2611 from openstreetmap/revert
...
Add ability to revert entity back to base version, use revert when resolving conflicts in favor of remote editor, don't save empty changesets.
2015-04-27 12:25:31 -04:00
Bryan Housel
587d1451be
More tests for Graph#revert (reverting new things should remove them)
2015-04-27 12:02:59 -04:00
Bryan Housel
b087e78528
Allow zoomToEntity to be called w/o Extent
...
In case user clicks on Entity description - line 102
2015-04-27 11:49:33 -04:00
Bryan Housel
cecdc012ee
Don't commit empty changesets.. ( closes #1483 )
...
instead, silently flush context and return to browse mode
2015-04-27 11:39:13 -04:00
Bryan Housel
a565b72f7d
Before saving, revert entities where user chose "keep theirs"
2015-04-27 10:18:07 -04:00
Bryan Housel
00c0641f06
Make view extent include both local and remote versions of the change
2015-04-27 10:16:47 -04:00
Bryan Housel
c10b83f28f
iD.actions.Revert (see #537 )
2015-04-26 01:08:31 -04:00
Bryan Housel
6b18066dd6
Graph#revert (see #537 )
2015-04-26 01:07:48 -04:00
Bryan Housel
3b18f1d33a
Fix corruption of conflicts array introduced in 06c0a7d
2015-04-24 16:33:49 -04:00
Bryan Housel
de5bac0a85
Don't unzorro ways that are overly connected ( closes #2598 )
2015-04-22 22:36:55 -04:00
Bryan Housel
d61af929df
Run make for farm preset
2015-04-22 20:38:24 -04:00
Bryan Housel
ccf3244a6a
Merge pull request #2604 from Stalfur/farm
...
Added farm as preset for Place
2015-04-22 20:35:28 -04:00
Bryan Housel
99d037e97f
Better logic for adding area=yes ( closes #2578 )
...
This fixes a few issues:
1. before: checked first key in applyTags and break loop, now: check all of them
(this was what caused `area=yes` to be added to 'branded' presets:
the first key is for these is `name` which isn't in areaKeys.)
2. add `area=yes` if user is drawing an area but the preset can be an
area or a line (e.g. `barrier=city_wall`)
3. remove `area=yes` when switching to another preset
2015-04-22 17:04:18 -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
8bacf9858a
Exclude barrier from areaKeys
...
Because like the others, they are generally
lines but can occasionally be areas or lines
2015-04-22 15:13:48 -04:00
Bryan Housel
995a9f4d50
Label commit message as "Changeset comment" ( closes #2600 )
2015-04-22 12:07:11 -04:00
Bryan Housel
420647f503
Remove LRM character, etc from websites and emails ( closes #2323 )
2015-04-22 11:57:50 -04:00
Bryan Housel
0313064e22
Use '; ' seperator for opening_hours-like tags ( closes #2301 )
2015-04-22 09:52:49 -04:00
Bryan Housel
bfbd1f2d1d
Clear cached userDetails when auth events occur ( fixes #2588 )
2015-04-21 23:11:14 -04:00
Bryan Housel
61bfc1d993
Style for barriers ( closes #2592 )
2015-04-21 11:41:45 -04:00
Bryan Housel
aa24891428
In wireframe mode, draw points like vertices ( closes #2591 )
2015-04-20 22:33:32 -04:00
Bryan Housel
54d30a18eb
Invert background opacity widget display values ( closes #2595 )
2015-04-20 21:22:10 -04:00
Bryan Housel
f8bd67c169
Save custom background to localstorage ( closes #2566 )
2015-03-31 20:11:41 -04:00
Bryan Housel
42efb9a475
make rebuilt en.json
2015-03-27 21:47:19 -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
