John Firebaugh
3da6935be0
Switch to landuse=farmland as the preferred preset ( fixes #2478 )
2014-12-17 09:36:54 -08:00
Bryan Housel
93b505259f
Mode change code in editOff no longer needed..
...
(because iD.modes.Select listens for drawn event and knows to exit itself)
2014-12-15 16:16:46 -05:00
Bryan Housel
de6d24f41a
Don't exit mode when selected elements are gone until after a draw pass
...
(fixes #2476 )
2014-12-15 16:08:01 -05:00
Bryan Housel
a3fc0d62e5
free radialMenu in exit ( fixes #2477 )
2014-12-15 10:10:52 -05:00
Bryan Housel
0c881ef9f2
merge ways with non-overlapping changes to nodelists
2014-12-13 22:50:29 -05:00
Bryan Housel
381142356b
add Diff3 library
2014-12-13 22:49:44 -05:00
Bryan Housel
977e29cfdb
Most iD.actions.MergeRemoteChanges features complete
...
(todo: merging ways where nodelist has not been reordered)
2014-12-11 23:52:53 -05:00
Bryan Housel
c74629ede8
handle relation selections, cleanup code,
...
closes #2469 , #2470
2014-12-10 23:30:09 -05:00
Bryan Housel
037bd19ebf
Fix help pane button toggling ( closes #2471 )
...
(and cleanup code to make background, map_data, help panes more consistent)
2014-12-10 13:30:11 -05:00
Bryan Housel
dc1221b8ba
pass graphs instead of entities to iD.actions.MergeRemoteChanges
...
(realized that I will need to compare more stuff from the
local and remote graphs in order to merge ways/relations)
2014-12-10 00:12:32 -05:00
Bryan Housel
d85da08cfe
fix "inherits entities from base prototypally" test
2014-12-10 00:11:09 -05:00
Bryan Housel
eff18cb257
add tests for iD.actions.MergeRemoteChanges
2014-12-09 00:59:25 -05:00
Bryan Housel
5aa95d4dd4
iD.actions.MergeRemoteChanges merges remote tags
2014-12-09 00:58:36 -05:00
Bryan Housel
3e97bd7d89
stub out iD.actions.MergeRemoteChanges
2014-12-06 22:11:54 -05:00
Bryan Housel
4088f2e70a
properly load changed entities into altgraph and produce diffs.
2014-12-05 11:15:45 -05:00
Bryan Housel
1c3d198b96
add force option for rebase to overwrite existing entities
...
related: openstreetmap/iD#2467
2014-12-04 19:50:32 -05:00
Bryan Housel
ba4f712711
Merge pull request #2467 from bhousel/localstorage-restore
...
Don't pass extra arguments from map to Entity initializer
2014-12-04 11:54:20 -05:00
Bryan Housel
edb94fd4d6
Merge branch 'localstorage-restore' into conflict-resolution
2014-12-04 11:52:51 -05:00
Bryan Housel
7c458513f3
Don't pass extra arguments from map to Entity initializer
...
fixes #2465
2014-12-02 22:14:31 -05:00
Martin Raifer
0d1c289354
Merge pull request #2463 from cschwarz/fix-country-code-error-handling
...
Fixed address input while nominatim is not available, fixes #2438
2014-11-30 23:02:51 +01:00
Christian Schwarz
1d580d3ca2
Fixed address input while nominatim is not available
2014-11-30 22:16:03 +01:00
Bryan Housel
ba919b8168
Conflict Resolution WIP: check server versions of modified nodes before sending changeset
2014-11-30 00:56:40 -05:00
Bryan Housel
5ca46fbbfb
support loading entities into alternate graph..
2014-11-30 00:55:55 -05:00
John Firebaugh
e17a72ba4a
Merge pull request #2451 from alexandrz/bench-covered-bus-stop
...
Updated bus_stop preset
2014-11-23 08:36:05 -08:00
Aleksandr Zykov
f1f4835848
added bench field
...
added bench and covered fields to bus_stop preset
2014-11-23 12:52:14 +05:00
Bryan Housel
3e391e87df
don't try to call Entity#geometry for midpoints
2014-11-21 10:58:32 -05:00
Bryan Housel
ebaaa4ba5a
Initialize radialMenu earlier
...
This prevents it from being undefined when exiting back to browse mode:
in selectElements() (re 2024e233
2014-11-19 00:18:39 -05:00
Bryan Housel
3974bcf41b
Move editable() to be with the other map things
2014-11-19 00:17:50 -05:00
Bryan Housel
81ea0276f8
Don't show "0 Hidden Features" warning after editOff
...
(regressed in 916a901
2014-11-18 22:05:20 -05:00
Bryan Housel
dfe8fd1e90
features performance enhancements
...
1. reusue entity.geometry where possible
2. cache entity parents
2014-11-18 22:05:08 -05:00
John Firebaugh
d444c907e8
Style
2014-11-11 15:12:08 -08:00
Sajjad Anwar
17fb2f64e5
Configurable minimum editable zoom
2014-11-11 14:37:11 -08:00
John Firebaugh
9e9a4b3cc0
Fix tests
2014-11-11 14:32:50 -08:00
John Firebaugh
916a901b8f
Show all features as auto-hidden when map is not editable
2014-11-11 14:16:16 -08:00
John Firebaugh
c66091c00c
Merge pull request #2357 from bhousel/feature-filtering
...
Feature filtering
2014-11-11 12:16:42 -08:00
Bryan Housel
2024e2333d
Exit select mode if selected DOM elements have disappeared
2014-11-10 23:23:28 -05:00
Bryan Housel
af3c307b17
cache invalidation and naming things
2014-11-10 22:47:07 -05:00
Bryan Housel
c6ca68ce80
create feature _cache to store matches per entity
...
also remove old commented code
2014-11-08 00:19:36 -05:00
jgpacker
977949292d
Fix a typo: Confectionary → Confectionery
2014-11-07 22:23:30 -02:00
Bryan Housel
30dde37e02
fix partial fill mode - pointer events visible stroke only
...
also, fix wireframe mode - pedestrian style
2014-11-06 23:47:54 -05:00
Bryan Housel
d5879fa855
reuse _stats, don't count vertices and relations
2014-11-06 23:04:25 -05:00
Bryan Housel
55e6f9ec93
faster tests for certain geometry (vertex, point)
2014-11-06 12:54:58 -05:00
Bryan Housel
0d6d4b3d24
remove footer "features hidden" warning in editOff
2014-11-06 00:33:45 -05:00
Bryan Housel
ace44d2e7d
fix highway-pedestrian line width to work in wireframe
2014-11-06 00:22:19 -05:00
Bryan Housel
788dedc595
more performance improvements for feature filters
...
* use named filter functions for easier profiling
* remove some unnecessary line/area geometry checks
* replace some lodash code with for loops
* reorder some tests to put cheap condition early
2014-11-06 00:18:45 -05:00
Bryan Housel
2f6004fcfa
performance tuning work-in-progress
...
* store entity's matched features in a graph transient
* replace fn calls to get commonly used _keys and _hidden arrays
* replace lodash calls with faster for loops (in some places)
* always pass graph/resolver as a param
2014-11-05 00:27:14 -05:00
John Firebaugh
59c39b5d17
Exclude name suggestions from areaKeys ( fixes #2435 )
2014-11-01 11:42:53 -04:00
samanpwbb
8ca46516e4
more straightforward preset form insertion
2014-10-31 17:15:59 -04:00
samanpwbb
140b56a68a
style adjustments + clean out unused code
2014-10-31 17:09:49 -04:00
Bryan Housel
c941bd5a4b
2 things related to gatherStats auto-hiding..
...
* skip gatherStats on differenced redraws..
* force full redraw when gatherStats autohides/unhides features
(before: extent redraws would happen, counts would update,
but buildings/points would stay on the screen)
2014-10-31 11:58:02 -04:00
