Commit Graph

5135 Commits

Author SHA1 Message Date
John Firebaugh 2ab9239a9f More accurate modification tests 2014-02-25 10:12:34 -08:00
John Firebaugh f6b7acf9ed Remove conditional that's always true
The base graph never has any ownProperty entities.
2014-02-25 10:03:48 -08:00
John Firebaugh 53f5379479 Merge pull request #2135 from tyrasd/master
fix duplicate objects after restoring data from localStorage
2014-02-25 09:59:10 -08:00
tyr efd3223e0c extend history loading fix to deletions
Deleted objects need to be kept in the base of the history stack, too.

This also improves the respective unit tests.
2014-02-22 14:09:17 +01:00
tyr 86c4bc9105 add tests for "restoring from v3 JSON" (core/history.js) 2014-02-21 10:19:36 +01:00
tyr fc0a15e6c4 fix duplicate objects after restoring data from localStorage
This makes sure that the originals of changed entities get merged
into the base of the stack after restoring the data from JSON.
This is necessary, because the stack will only have elements for
the current viewport after a restart and previously *modified*
objects will now be falsely detected as *created* ones.

Also removed some ineffective code.
2014-02-21 10:01:26 +01:00
John Firebaugh 44e260a429 Fix tests 2014-02-19 09:46:54 -08:00
John Firebaugh 69960d75bd Use https where supported
Refs #2129
2014-02-19 09:40:22 -08:00
John Firebaugh 9e1c1cee06 Add shop=art preset
Fixes #2125
2014-02-16 11:28:45 -08:00
John Firebaugh d1f02b2ac7 Add shop=bookmaker and shop=lottery presets
Fixes #2126
2014-02-16 11:25:37 -08:00
John Firebaugh 327af5176b Fix jshint 2014-02-09 18:48:52 -08:00
John Firebaugh 3733b02a37 Expand tests 2014-02-09 18:45:47 -08:00
John Firebaugh 173108ae46 Style adjustments 2014-02-09 18:45:31 -08:00
tyr 90fd8b6e51 disable merge operation if at least one relation is incomplete
Incomplete multipolygons were harmed in the merge operation (which
relies on completely loaded relations to determine inner/outer
status for example).

This disables the operation and adds an appropriate tooltip.
2014-02-09 18:41:31 +01:00
tyr 422f76be77 merge-polygons: do not merge tags from all possible members
previously when merging polygons, all tags from all involved
members were merged into the resulting multipolygon. This includes
existing inner members with different tags or outer members that
are not directly involved in the merge operations.

Example: A forest (landuse=forest) containing some clearings
(landuse=meadow), whose outline is in part a river (waterway=river)
is merged with a new untagged area. The resulting multipolygon
would have falsely been tagged: landuse=forest;meadow + waterway=river
2014-02-09 17:53:55 +01:00
John Firebaugh 6752c198f7 Build 2014-02-08 09:24:22 -08:00
Martin Raifer efdc5d9602 use proper tag in dentist preset
fixes #2120
2014-02-08 10:31:41 +01:00
John Firebaugh 5ba5d80009 Build 2014-02-05 17:52:57 -08:00
Nick 06aba8b856 Added building field to railway:station 2014-02-05 19:25:47 -04:00
Nick 493249b466 Remove semicolon
Bad Java Habbits
2014-02-05 19:23:10 -04:00
Nick 4a34263a0f Make building:train_station unsearchable 2014-02-05 19:22:48 -04:00
ingalls cca98c93a5 Fix Spelling & Change to US English 2014-02-05 17:58:41 -04:00
ingalls 63b63339b1 Make building:bunker Unsearchable 2014-02-05 17:50:32 -04:00
ingalls bc7686ec82 Add Building Presets 2014-02-05 16:38:46 -04:00
John Firebaugh 6c82b1beda 1.3.6 2014-02-05 10:07:52 -08:00
John Firebaugh ad1685e029 Update imagery 2014-02-05 10:05:11 -08:00
John Firebaugh e8f4e4caaa Update translations 2014-02-05 10:04:53 -08:00
John Firebaugh 4f424c5310 Build 2014-01-27 13:21:10 -08:00
John Firebaugh e14f74e7d5 Merge pull request #2109 from oddityoverseer13/master
Added social_facility presets
2014-01-27 13:19:54 -08:00
John Firebaugh 5f150a78a3 Merge pull request #2103 from tyrasd/validate-presets
add consistency checks for fields of presets and presets in categories
2014-01-27 13:18:04 -08:00
oddityoverseer13 6accb762ac Added group home preset 2014-01-27 14:10:24 -07:00
oddityoverseer13 af8c417601 Fixed a json syntax error in social_facility.json 2014-01-27 12:09:51 -07:00
oddityoverseer13 84bb61c0c9 Added a field definition for social_facility:for=*
Also added the field to the existing social_facility presets
2014-01-27 12:07:53 -07:00
oddityoverseer13 e8ca3b4666 Added a preset for generic "social facility" 2014-01-27 10:58:13 -07:00
oddityoverseer13 fa31b12ab3 Added food bank preset 2014-01-27 10:51:07 -07:00
oddityoverseer13 290f030c5d Added preset for homeless shelter 2014-01-27 10:47:44 -07:00
John Firebaugh 86faf95edc Update mocha 2014-01-23 10:04:29 -08:00
John Firebaugh 316728113b Update mocha-phantomjs 2014-01-23 09:51:59 -08:00
John Firebaugh a86cfa9087 Merge pull request #2104 from paulmach/ortho12
Bump threshold for Orthogonalize to 12 degrees
2014-01-16 12:43:43 -08:00
Paul Mach 4078d353b2 Bump threshold for Orthogonalize to 12 degrees 2014-01-16 12:06:54 -08:00
John Firebaugh 7c02f0f44f Capitalize 'Painter' preset name 2014-01-15 14:06:40 -08:00
tyr 4de0c6cb4e do not write any data files if preset validation fails 2014-01-15 22:36:53 +01:00
tyr 80dbf3085e add consistency checks for fields of presets and presets in categories 2014-01-15 22:23:11 +01:00
tyr bde045d30c allow the rotate operation also for closed multipolygon members
closes #1718
2014-01-15 10:50:49 -08:00
John Firebaugh 2b64678b8f Remove reference to nonexistent field
Fixes #2102
2014-01-15 10:13:38 -08:00
John Firebaugh 3f31f7a85a Merge pull request #2097 from tyrasd/patch-self-referencing-relations
protect against relation loops, part 2.
2014-01-10 11:19:06 -08:00
tyr b71c98cfca protect against relation loops, part 2. fixes #2096 2014-01-10 11:12:10 +01:00
John Firebaugh b1bffb5037 Minor en.json update that got missed 2014-01-08 18:12:34 -08:00
John Firebaugh 949280b736 1.3.5 2014-01-08 17:59:26 -08:00
John Firebaugh dc41ed196d Update imagery 2014-01-08 17:59:26 -08:00