Create /map/ route for wiki pages #7061

nstjean · 2019-12-30T20:05:49Z

Fixes #7060 (<=== Add issue number here)

Created a route /map/wiki/:wikislug - I couldn't use /map/:wikislug because we already had a route with that pattern.
If Wiki exists then it is checking for location info to display:

If the map is panned while looking at a wiki page map then it displays the current location in the hash so it can be copied and pasted. If there is location info in the URL hash it will override the display of the wiki's saved location.

If Wiki exists but does not have location information this is displayed:

If wiki does not exist user is redirected to the standard /map/ and a "not found" message is shown:

nstjean · 2019-12-31T19:12:46Z

Here is a wiki page that has a location:

This is the map when the button is clicked on:

This is a note that has a location with a top map:

This is the map when the button has been clicked on:

And this is how the url updates while you are panning and zooming!

nstjean · 2019-12-31T19:21:54Z

Based on feedback in #6993 I've changed the routes and URL hash pattern
Wiki route is now /map/:wikislug
And general route is /map#zoom/lat/lon

Currently there is no way to specify active layers, that can be added on to the hash if it is needed!

sagarpreet-chadha · 2020-01-01T09:00:17Z

Looks great!!!

sagarpreet-chadha · 2020-01-01T09:14:55Z

Make a “/map/wiki_slug” route that sources lat/lon/zoom from the matching wiki page
Generate/update URL hashes on /map/wiki_slug#zoom/lat/lon pages as you drag the
map
Display notes, wikis, and people on “/map/slug” pages
Display popups showing title, link for each wiki, note, and question
Make a “#” permalink (in grey) appear in wiki page popups that show “/map/slug”
permalinks for sharing
Add a “View map” button to geotagged page sidebars, opening “/map/slug” style URLs
for wikis, and “/map#zoom/lat/lon” URL hashes for notes
Add a “Add to map +” prompt button on any “/map/...” pages to add a note, question or
wiki at that location
Direct users to a post type selection page from the above prompt button, at
“/post/choose?tags=lat:10,lon:10 -- preserving params!)

sagarpreet-chadha · 2020-01-01T09:15:28Z

Hey @nstjean , i think we will be solving all these things here, right?

nstjean · 2020-01-01T14:15:29Z

@sagarpreet-chadha I've marked off the 3 that are taken care of with my current PRs!

jywarren

Really awesome. Ready to merge?!!?

nstjean · 2020-01-01T14:32:55Z

@jywarren I created this branch from the #7046 branch, so I think that needs to be merged first, then this rebased to master.

codecov · 2020-01-02T19:23:17Z

Codecov Report

Merging #7061 into master will increase coverage by 0.15%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #7061      +/-   ##
==========================================
+ Coverage   80.83%   80.98%   +0.15%     
==========================================
  Files          97       97              
  Lines        5572     5585      +13     
==========================================
+ Hits         4504     4523      +19     
+ Misses       1068     1062       -6

Impacted Files	Coverage Δ
app/controllers/map_controller.rb	`50% <100%> (+7.55%)`	⬆️
app/models/node.rb	`90.85% <0%> (+0.18%)`	⬆️
app/controllers/editor_controller.rb	`76.74% <0%> (+2.32%)`	⬆️

nstjean · 2020-01-02T19:40:19Z

@jywarren This is all set now!

jywarren · 2020-01-02T20:49:42Z

Ah, i'm sorry, i wanted to add one more small request - could we left-align the button? Apologies! Then this is perfect!

nstjean · 2020-01-03T14:13:22Z

Yes of course! I'll get that moved.

nstjean · 2020-01-03T15:41:09Z

Here you go, it's all set!

nstjean · 2020-01-03T16:13:33Z

Now the codecov test is failing. Do I need to do something different?

jywarren · 2020-01-03T17:21:54Z

Hmm, I don't think so - i want to see if we can modify the thresholds; i think it's saying that it doesn't like that the new code is not tested to at least the percentage coverage of the overall repository. We could add a functional test or a system test to address this, maybe? We're just getting used to the new CodeCov checks, sorry!

nstjean · 2020-01-03T17:57:46Z

Hmmm ok. I was going to add some tests for this anyways!

nstjean · 2020-01-03T20:02:30Z

Ok I added map_test.rb to system tests to test out various map options and display. It should cover the map#wiki controller.

sagarpreet-chadha

Tests are awesome!!!

sagarpreet-chadha · 2020-01-05T05:00:52Z

app/views/map/map.html.erb

      const bounds = new L.LatLngBounds(
        new L.LatLng(84.67351257, -172.96875),
        new L.LatLng(-54.36775852, 178.59375)
      );

-      var user_lat = null;


Yes awesome i wanted this to be removed from here and not the URLHash logic! Thanks!

sagarpreet-chadha · 2020-01-05T05:04:00Z

app/assets/javascripts/urlMapHash.js

@@ -0,0 +1,53 @@
+function urlMapHash() {
+  // This is based off of jywarren's urlhash, made specific to our map hash needs
+


Hey this is cool, can you tell what specific changes you did to match plots2? Is the URL different now? Thanks!

I changed the format to be #zoom/lat/lon. I really like having a hash function available to get and set the values!

Quick question, have the layer names been removed from the hash?

Currently yes they aren't in the hash. It had been set up to use the route for the layer names, which had to be changed. Do you need them added back in? It's easy enough to add them at the end of the hash, if that works for @jywarren ?

No, that's fine for now. I was trying to figure out an issue when I noticed we don't have them anymore. :)

We had them to track active layers. In LEL it is used in the embed to preserve the state of the layers. I don't remember if this was the case in plots2? @sagarpreet-chadha, could you confirm?

Hey,
So i made embed feature to take array of layers as input, and show them on map by default (@nstjean ...we will use this in /people map in plots2). This feature is unrelated to url hash AFAIK.

If we will require layer names in future, it should be pretty easy, right? Thanks!

Okay. Got it. To correct what I said earlier, it wasn't in the hash but before it. Thanks, @sagarpreet-chadha!

nstjean · 2020-01-06T14:50:07Z

Wow, I don't know what was changed with the codecov, but now my patch went from 70% before to 15% now!

jywarren · 2020-01-06T15:06:02Z

Ah, i think it gets logged gradually, so by the time the Travis run finishes it may be much higher. I wish it notified about that! Let's see!

nstjean · 2020-01-06T15:36:01Z

It did go back up! Interesting.

This is the test failure, which doesn't make sense to me. Unless me adding the new tags broke this somehow? I didn't change anything that existed, just added.

And then every one of my map tests is timing out and erroring. 😒

nstjean · 2020-01-06T15:55:52Z

I took a look and ran it in my local dev to try out some different numbers.

I believe that page may be broken. Take a look: https://publiclab.org/contributors/general
How can we have 61 contributors making 32 posts? I think me adding some new tags in the test fixtures caused this to be visible. The test is supposed to count the number of users in the controller vs. the number of rows on the page, and it's not equal: it's coming back with 0 rows but 1 user in the controller.

plots2/test/functional/tag_controller_test.rb

Lines 372 to 385 in df0b944

    
           test 'tag contributors' do 
        
             get :show, 
        
                 params: { 
        
                   node_type: 'contributors', 
        
                   id: Tag.last.name 
        
                 } 
        
             assert :success 
        
             assert_not_nil :notes 
        
             assert_not_nil :users 
        
             assert_not_nil :tag 
        
             selector = css_select ".users-row" 
        
             assert_equal selector.size, assigns(:users).length 
        
           end

What do you want me to do? Fixing this page could take a while.

nstjean · 2020-01-10T19:33:30Z

Hooray!! @jywarren this passed the tests! I think it's ready for merge!

jywarren · 2020-01-10T22:08:41Z

Awesome!! we can test it at stable.publiclab.org now.

nstjean · 2020-01-13T15:46:25Z

Yay!!! Oh this is exciting to see, haha.

* add route for map/wiki/:id and display wiki location * add error messages for no location, no wiki * fix codeclimate error * display url hash on page load * Add buttons on wiki pages to link to map or prompt location entry * add redirect from /maps/ to /map/ * change url hash format to #zoom/lat/lon * fix codeclimate error * change button on wiki and page to new hash format * change PublicPagesTest test from /maps to /map * clean up code * remove center tag and unnecessary javascript * add map tests to system tests * include 0 in testing numbers * increase capybara default max wait time * change test tag contributors to a fixed tag name to stop error * remove two tests to check if it passes on server * add map controller tests * attempt to fix travis error * comment out all system map tests * format assertion in show map by hash location in a different way * hide show map by hash location, show correct url for wiki map * Increase wait time for map system tests * update yarn.lock * set max wait time to 90

nstjean mentioned this pull request Dec 30, 2019

Outreachy project planning #6887

Closed

jywarren approved these changes Jan 1, 2020

View reviewed changes

nstjean mentioned this pull request Jan 1, 2020

Use default location lat lon for /map/ #7046

Merged

2 tasks

jywarren mentioned this pull request Jan 1, 2020

Follow-up tasks for new /map... route #6993

Closed

8 tasks

nstjean force-pushed the map-wiki-route branch from 8caa23a to 6acea52 Compare January 2, 2020 18:33

nstjean changed the title ~~[WIP] Create /map/ route for wiki pages~~ Create /map/ route for wiki pages Jan 2, 2020

nstjean force-pushed the map-wiki-route branch from 6acea52 to aea3216 Compare January 3, 2020 15:39

jywarren mentioned this pull request Jan 3, 2020

Resolve coverage reporting issues with CodeCov #6290

Open

jywarren mentioned this pull request Jan 3, 2020

Add threshold to codecov.yml and set certain files to ignore #7106

Merged

sagarpreet-chadha reviewed Jan 5, 2020

View reviewed changes

nstjean added 21 commits January 10, 2020 10:46

display url hash on page load

e6ef6be

Add buttons on wiki pages to link to map or prompt location entry

578597e

add redirect from /maps/ to /map/

8c0cd7b

change url hash format to #zoom/lat/lon

97bfba0

fix codeclimate error

a3798d9

change button on wiki and page to new hash format

156f243

change PublicPagesTest test from /maps to /map

4007f36

clean up code

f41b7e4

remove center tag and unnecessary javascript

6d8f8f5

add map tests to system tests

03e79ff

include 0 in testing numbers

bbf6d9c

increase capybara default max wait time

4b9f645

change test tag contributors to a fixed tag name to stop error

17801ed

remove two tests to check if it passes on server

13a3100

add map controller tests

10a4ceb

attempt to fix travis error

034044a

comment out all system map tests

ed4b780

format assertion in show map by hash location in a different way

c2829a6

hide show map by hash location, show correct url for wiki map

2a1c3c9

Increase wait time for map system tests

9fbe561

update yarn.lock

498d826

nstjean force-pushed the map-wiki-route branch from 6dd959f to 498d826 Compare January 10, 2020 16:05

set max wait time to 90

e7a54a3

jywarren merged commit 9fe2504 into publiclab:master Jan 10, 2020

crisner mentioned this pull request Feb 4, 2020

Outreachy Project Recap: summary, planning & discussion #7432

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create /map/ route for wiki pages #7061

Create /map/ route for wiki pages #7061

nstjean commented Dec 30, 2019 •

edited

Loading

nstjean commented Dec 31, 2019

nstjean commented Dec 31, 2019

sagarpreet-chadha commented Jan 1, 2020

sagarpreet-chadha commented Jan 1, 2020 •

edited by nstjean

Loading

sagarpreet-chadha commented Jan 1, 2020

nstjean commented Jan 1, 2020

jywarren left a comment

nstjean commented Jan 1, 2020

codecov bot commented Jan 2, 2020 •

edited

Loading

nstjean commented Jan 2, 2020

jywarren commented Jan 2, 2020

nstjean commented Jan 3, 2020

nstjean commented Jan 3, 2020

nstjean commented Jan 3, 2020

jywarren commented Jan 3, 2020

nstjean commented Jan 3, 2020

nstjean commented Jan 3, 2020

sagarpreet-chadha left a comment

sagarpreet-chadha Jan 5, 2020

sagarpreet-chadha Jan 5, 2020

nstjean Jan 6, 2020

crisner Jan 16, 2020

nstjean Jan 16, 2020

crisner Jan 16, 2020

crisner Jan 16, 2020

sagarpreet-chadha Jan 18, 2020

crisner Jan 18, 2020

nstjean commented Jan 6, 2020

jywarren commented Jan 6, 2020

nstjean commented Jan 6, 2020

nstjean commented Jan 6, 2020

nstjean commented Jan 10, 2020

jywarren commented Jan 10, 2020

nstjean commented Jan 13, 2020

		@@ -0,0 +1,53 @@
		function urlMapHash() {
		// This is based off of jywarren's urlhash, made specific to our map hash needs

Create /map/ route for wiki pages #7061

Create /map/ route for wiki pages #7061

Conversation

nstjean commented Dec 30, 2019 • edited Loading

nstjean commented Dec 31, 2019

nstjean commented Dec 31, 2019

sagarpreet-chadha commented Jan 1, 2020

sagarpreet-chadha commented Jan 1, 2020 • edited by nstjean Loading

sagarpreet-chadha commented Jan 1, 2020

nstjean commented Jan 1, 2020

jywarren left a comment

Choose a reason for hiding this comment

nstjean commented Jan 1, 2020

codecov bot commented Jan 2, 2020 • edited Loading

Codecov Report

nstjean commented Jan 2, 2020

jywarren commented Jan 2, 2020

nstjean commented Jan 3, 2020

nstjean commented Jan 3, 2020

nstjean commented Jan 3, 2020

jywarren commented Jan 3, 2020

nstjean commented Jan 3, 2020

nstjean commented Jan 3, 2020

sagarpreet-chadha left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nstjean commented Jan 6, 2020

jywarren commented Jan 6, 2020

nstjean commented Jan 6, 2020

nstjean commented Jan 6, 2020

nstjean commented Jan 10, 2020

jywarren commented Jan 10, 2020

nstjean commented Jan 13, 2020

nstjean commented Dec 30, 2019 •

edited

Loading

sagarpreet-chadha commented Jan 1, 2020 •

edited by nstjean

Loading

codecov bot commented Jan 2, 2020 •

edited

Loading