Refactor maps code #416

rjmackay · 2016-11-14T23:24:39Z

This pull request makes the following changes:

Rewrite post-view-map
Rewrite post detail maps
Vastly simplify Maps helper
Remove angular-leaflet-directive
Rewrite location editor
Rewrite map settings

Test these changes by:

Load the map view, check it all works fine
Check map popups work
Check it works with clustering disabled
Edit a post, check the location editor all works
Edit map settings
- confirm you can move the marker around the map, zoom in/out
- confirm map updates when changing settings below it

Ping @ushahidi/platform

This change is

- Don't user angular-leaflet-directive - Vastly simplify Maps helper - Rewrite post-view-map

- Move map creation to shared function - Rewrite post detail map code into own directive

- Make markers draggable

coveralls · 2016-11-14T23:27:21Z

Coverage decreased (-3.5%) to 70.903% when pulling d8e1cac on refactor-maps-code into d9fd6f9 on webpack.

coveralls · 2016-11-15T03:10:31Z

Coverage decreased (-0.6%) to 73.747% when pulling c6d923f on refactor-maps-code into d9fd6f9 on webpack.

coveralls · 2016-11-15T03:13:32Z

Coverage decreased (-0.6%) to 73.747% when pulling c6d923f on refactor-maps-code into d9fd6f9 on webpack.

- Replace leaflet default markers in location editor - Replace leaflet default markers in map settings

coveralls · 2016-11-17T03:58:48Z

Coverage decreased (-0.6%) to 73.747% when pulling f8cc7f6 on refactor-maps-code into d9fd6f9 on webpack.

coveralls · 2016-11-17T04:04:11Z

Coverage increased (+0.6%) to 74.932% when pulling 4312795 on refactor-maps-code into d9fd6f9 on webpack.

Conflicts: app/main/posts/posts-module.js

rjmackay · 2016-11-17T04:39:23Z

@jshorland URL to test is http://qa.refactor-maps-code.ushahidilab.com/

coveralls · 2016-11-17T04:41:56Z

Coverage increased (+0.6%) to 74.933% when pulling 15bd004 on refactor-maps-code into 129bafe on webpack.

willdoran

LGTM

willdoran · 2016-11-17T18:01:06Z

test/unit/mock/services/post.js

-            }};
+            return {
+                /* jshint ignore:start */
+                $promise: $q.when({"type": "FeatureCollection","features": [{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-122.330062,47.603832]}]},"properties": {"title": "Testing our qa twitter account","description": "Testing our qa twitter account\n\n#ushahidiqatest","marker-color": "#E69327","id": 2600,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2600"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.707703,30.063236]}]},"properties": {"title": "Masonry","description": "785275","marker-color": "#E69327","id": 2573,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2573"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.707146,30.102217]}]},"properties": {"title": "Wood","description": "223488","marker-color": "#E69327","id": 2575,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2575"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.704613,30.118774]}]},"properties": {"title": "Edited","description": "433512","marker-color": "#E69327","id": 2576,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2576"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.700455,30.089579]}]},"properties": {"title": "Wood","description": "206893","marker-color": "#E69327","id": 2570,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2570"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [77.531287,13.075209]},{"type": "Point","coordinates": [77.531287,13.075209]}]},"properties": {"title": "post via twitter","description": "#publicpolicy making in the #digital age https:\/\/t.co\/maAwmik3Zz #PolicyMakers #policymaking #ICT #ICT4D #ICT4D2016 #ICT4Dev #techforgood","marker-color": "#E69327","id": 2527,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2527"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.711777,30.102261]}]},"properties": {"title": "119736","description": "Masonry","marker-color": "#E69327","id": 2508,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2508"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.702675,30.060614]}]},"properties": {"title": "172534","description": "Wood","marker-color": "#E69327","id": 2512,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2512"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.707703,30.063236]}]},"properties": {"title": "785275","description": "Masonry","marker-color": "#E69327","id": 2513,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2513"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.713882,30.102226]}]},"properties": {"title": "995932","description": "Reinforced Concrete","marker-color": "#E69327","id": 2514,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2514"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.707664,30.063936]}]},"properties": {"title": "Masonry","description": "448094","marker-color": "#E69327","id": 2446,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2446"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.700455,30.089579]}]},"properties": {"title": "Wood","description": "206893","marker-color": "#E69327","id": 2447,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2447"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.707703,30.063236]}]},"properties": {"title": "Wood","description": "333743","marker-color": "#E69327","id": 2448,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2448"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.702675,30.060614]}]},"properties": {"title": "Wood","description": "172534","marker-color": "#E69327","id": 2449,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2449"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.707703,30.063236]}]},"properties": {"title": "Masonry","description": "785275","marker-color": "#E69327","id": 2450,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2450"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.713882,30.102226]}]},"properties": {"title": "Reinforced Concrete","description": "995932","marker-color": "#E69327","id": 2451,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2451"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.711777,30.102261]}]},"properties": {"title": "Masonry","description": "119736","marker-color": "#E69327","id": 2427,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2427"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.702675,30.060614]}]},"properties": {"title": "Wood","description": "172534","marker-color": "#E69327","id": 2431,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2431"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.707703,30.063236]}]},"properties": {"title": "Masonry","description": "785275","marker-color": "#E69327","id": 2432,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2432"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-81.713882,30.102226]}]},"properties": {"title": "Reinforced Concrete","description": "995932","marker-color": "#E69327","id": 2433,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2433"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [-122.330062,47.603832]}]},"properties": {"title": "jess testing radio button fix","description": "radio button pattern should match pattern library","marker-color": "#A51A1A","id": 2287,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/2287"}},{"type": "Feature","geometry": {"type": "GeometryCollection","geometries": [{"type": "Point","coordinates": [36.817245,-1.283253]}]},"properties": {"title": "Sample post type from Angie","description": "This is my sample image post","marker-color": "#2274B4","id": 24,"url": "http:\/\/qa.api.ushahididev.com\/api\/v3\/posts\/24"}}]})


It would be nice to be able to use fixtures more in our tests, that way keeping data inline with the backend will be easier.

jshorland · 2016-11-17T18:19:35Z

Shadows when nearby map markers NOT combined are ugly
if my post has a picture, it centers on the map pop and then loads picture instead of the other way around. In the case of one post, I couldn't click on the title because the picture caused it to be off the map.
"under review" icon on map pop ups is off

rjmackay · 2016-11-17T18:41:09Z

Shadows when nearby map markers NOT combined are ugly

Thats an issue already, not created by this change. I checked and logged it on the PL because its a styling issue ushahidi/platform-pattern-library#105

if my post has a picture, it centers on the map pop and then loads picture instead of the other way around. In the case of one post, I couldn't click on the title because the picture caused it to be off the map.

Again thats an existing bug, not caused by this change. I'll have a look to see if there's a quick fix.

Under review icon

Will fix that..

Override leaflet position:absolute for svg.iconic

coveralls · 2016-11-17T21:21:52Z

Coverage increased (+0.6%) to 74.933% when pulling ab1e337 on refactor-maps-code into 129bafe on webpack.

rjmackay added 7 commits November 14, 2016 18:08

Rewrite mapping code

ec32e56

- Don't user angular-leaflet-directive - Vastly simplify Maps helper - Rewrite post-view-map

Refactor post detail maps

4ad0b06

- Move map creation to shared function - Rewrite post detail map code into own directive

Rename post-location and setting map directive files

9adc78c

Reinstate map clustering option

e828fc8

Refactor post location editor

56fe0ff

- Make markers draggable

Refactor settings map directive

78fd21c

Remove leaflet directive

d8e1cac

rjmackay temporarily deployed to ushahidi-platform-devel-pr-416 November 14, 2016 23:24 Inactive

rjmackay added the 7 - In Review label Nov 14, 2016

Update unit tests

c6d923f

rjmackay temporarily deployed to ushahidi-platform-devel-pr-416 November 15, 2016 03:08 Inactive

rjmackay force-pushed the refactor-maps-code branch from e16d480 to c6d923f Compare November 15, 2016 03:08

rjmackay temporarily deployed to ushahidi-platform-devel-pr-416 November 15, 2016 03:08 Inactive

ushbot temporarily deployed to rackspace_pr November 15, 2016 20:46 Inactive

rjmackay added 2 commits November 17, 2016 16:55

Replace leaflet default markers with Ushahidi style marker

f8cc7f6

- Replace leaflet default markers in location editor - Replace leaflet default markers in map settings

Better test coverage

4312795

rjmackay temporarily deployed to ushahidi-platform-devel-pr-416 November 17, 2016 03:56 Inactive

rjmackay assigned zhalloran and willdoran Nov 17, 2016

rjmackay temporarily deployed to ushahidi-platform-devel-pr-416 November 17, 2016 03:59 Inactive

ushbot temporarily deployed to rackspace_pr November 17, 2016 04:07 Inactive

rjmackay mentioned this pull request Nov 17, 2016

Build with webpack #334

Merged

7 tasks

Merge branch 'webpack' into refactor-maps-code

15bd004

Conflicts: app/main/posts/posts-module.js

rjmackay temporarily deployed to ushahidi-platform-devel-pr-416 November 17, 2016 04:39 Inactive

ushbot temporarily deployed to rackspace_pr November 17, 2016 04:46 Inactive

willdoran approved these changes Nov 17, 2016

View reviewed changes

Fix Iconic icons in map popups

ab1e337

Override leaflet position:absolute for svg.iconic

rjmackay deployed to ushahidi-platform-devel-pr-416 November 17, 2016 21:18 View deployment

ushbot temporarily deployed to rackspace_pr November 17, 2016 21:25 Inactive

rjmackay added 9 - Waiting to deploy and removed 7 - In Review labels Nov 17, 2016

rjmackay mentioned this pull request Nov 17, 2016

Map marker not centering on click ushahidi/platform#1495

Closed

rjmackay changed the base branch from webpack to develop November 17, 2016 22:52

rjmackay merged commit ec47ea9 into develop Nov 17, 2016

rjmackay removed the 9 - Waiting to deploy label Nov 17, 2016

tuxpiper deleted the refactor-maps-code branch August 19, 2020 12:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor maps code #416

Refactor maps code #416

rjmackay commented Nov 14, 2016 •

edited

Loading

coveralls commented Nov 14, 2016 •

edited

Loading

coveralls commented Nov 15, 2016 •

edited

Loading

coveralls commented Nov 15, 2016 •

edited

Loading

coveralls commented Nov 17, 2016 •

edited

Loading

coveralls commented Nov 17, 2016 •

edited

Loading

rjmackay commented Nov 17, 2016

coveralls commented Nov 17, 2016 •

edited

Loading

willdoran left a comment

willdoran Nov 17, 2016

jshorland commented Nov 17, 2016

rjmackay commented Nov 17, 2016

coveralls commented Nov 17, 2016 •

edited

Loading

Refactor maps code #416

Refactor maps code #416

Conversation

rjmackay commented Nov 14, 2016 • edited Loading

coveralls commented Nov 14, 2016 • edited Loading

coveralls commented Nov 15, 2016 • edited Loading

coveralls commented Nov 15, 2016 • edited Loading

coveralls commented Nov 17, 2016 • edited Loading

coveralls commented Nov 17, 2016 • edited Loading

rjmackay commented Nov 17, 2016

coveralls commented Nov 17, 2016 • edited Loading

willdoran left a comment

Choose a reason for hiding this comment

willdoran Nov 17, 2016

Choose a reason for hiding this comment

jshorland commented Nov 17, 2016

rjmackay commented Nov 17, 2016

coveralls commented Nov 17, 2016 • edited Loading

rjmackay commented Nov 14, 2016 •

edited

Loading

coveralls commented Nov 14, 2016 •

edited

Loading

coveralls commented Nov 15, 2016 •

edited

Loading

coveralls commented Nov 15, 2016 •

edited

Loading

coveralls commented Nov 17, 2016 •

edited

Loading

coveralls commented Nov 17, 2016 •

edited

Loading

coveralls commented Nov 17, 2016 •

edited

Loading

coveralls commented Nov 17, 2016 •

edited

Loading