min_display_zoom & max_display_zoom #944

hallahan · 2016-08-30T21:43:26Z

This PR allows you to set a min_zoom parameter in your sources block of your scene.yaml.

When a source is given a min_zoom parameter, it does not fetch tiles below that min zoom. This includes the raster sub-sources we see with normals, as found in Walkabout and other terrain styles.

As @bcamper mentioned, we might actually want to call this parameter min_display_zoom, since we don't under-zoom data at lower zooms--we simply don't provide it.

I'm happy to re-factor that into this PR. Also, we could take a similar approach found here to implement max_display_zoom.

tangrams/tangram#394

Thinking about also implementing bounds, we could build that into DataSource#isActiveForZoom, calling it isActive instead.

cc/ @tallytalwar @blair1618 @bcamper

hallahan · 2016-09-06T16:37:49Z

At this point, I've refactored min_zoom to be min_display_zoom. I have also implemented max_display_zoom.

hallahan · 2016-09-06T19:12:04Z

Interesting, Travis caught that Android was missing the #define for INT32_MAX. Perhaps I should just #ifndef in the value to the token in the header?

tallytalwar · 2016-09-06T20:40:07Z

Can you rebase this with master? some of the commits you have above have already been merged!

tallytalwar · 2016-09-06T21:06:43Z

core/src/data/clientGeoJsonSource.h

@@ -23,7 +23,8 @@ class ClientGeoJsonSource : public DataSource {

 public:

-    ClientGeoJsonSource(const std::string& _name, const std::string& _url, int32_t _maxZoom = 18);
+    ClientGeoJsonSource(const std::string& _name, const std::string& _url,
+                        int32_t _minDisplayZoom = 0, int32_t _maxDisplayZoom = INT32_MAX, int32_t _maxZoom = 18);


I think its fine to use 18 as the maxDisplayZoom default instead of INT32_MAX.

Or a default value of -1 can be used to ignore any pruning of tiles based on min or max display zooms.

Doesn't the map actually proxy tile higher zooms than 18? What if we wanted to zoom to 28 and explore a map of the stores in a mall or something?

Yup in that case what I suggested to use is -1. Similar to how js does it and has a null as default.

hallahan · 2016-09-07T02:14:12Z

@tallytalwar - I implemented the proposed changes. Ready for another look. Thanks!

tallytalwar · 2016-09-07T14:57:15Z

ios/src/TGMapViewController.h

@@ -12,6 +12,26 @@
 #import <UIKit/UIKit.h>


How come these changes are in this PR?

From my understanding, that's because I did a rebase from tangrams/master to hallahan/minZoom. Git gets kinda weird when dealing with another origin sometimes. It's because I did commits at a point before this iOS work and then rebased yesterday. The nature of rebase is that history gets rewritten, so that commit, as you can see, has a different SHA1. The older problem where we saw old commits that have already been merged is because I branched off of hallahan/master instead of tangrams-es/master. It was up to date, but the fact that one origin merged into another created that effect.

The only way I could resolve this is to make a new branch and cherry pick my commits into a new one and open a new PR. However, I wonder, would it take me out of the commit message once you merge the PR? Since, all of my commits should say it was hallahan with tallytalwar? I can do a new PR if needed. Sorry this is such a headache!

http://stackoverflow.com/questions/32826197/interactive-rebase-after-merging-other-commits-interleaving-mine

Hmm.. Probably one more thing you can do here is to take this (c159079) commit out.

git rebase -i HEAD~12

remove the line mentioning this (c159079) commit.

save

to be sure you are all good, do a diff of this local branch with the remote.

I also plan to "squash and merge" this PR, so it should say "hallahan with tallytalwar" when merged.

Hmm, when I delete c159079 in the interactive rebase, I get conflicts for each commit. When I resolve each, I then diff it with tangrams master, and it removes all of the iOS code. Continuing to look into this...

OK, after looking further into it. I don't think there is a solution to removing cc159079 from the rebased branch without actually removing the diff that that commit applies.

I went ahead and made a new branch and applied a diff of the minZoom branch.

https://github.com/hallahan/tangram-es/tree/display_zoom

We can a) open a new PR with that, or b) just merge this PR as-is.

Sorry for the weird rebase.

tallytalwar · 2016-09-07T14:59:08Z

Changes look good, once the comments are addressed and propertly rebased with master will merge.

Thanks @hallahan

* Implement camera handling APIs in objective-c Includes tilt, rotation, zoom, and position management, as well as camera type switching. Fixes tangrams#849, tangrams#850, tangrams#851, tangrams#858, tangrams#897 * Updated for consistency with android. Rebased against master * Re-set continuous rendering to be explicitly false. * Update ease type defaults, add animation functions for camera tilt. * Rename cameraTilt -> tilt * Tweak camera API names for consistency

…d an empty texture.

…s are not culled with this value.

tallytalwar · 2016-09-07T20:24:12Z

This is good to go, merging when travis goes green.

hallahan changed the title ~~Min Zoom~~ min_display_zoom & max_display_zoom Sep 6, 2016

tallytalwar reviewed Sep 6, 2016
View changes

hallahan force-pushed the minZoom branch from 997e28c to 310376e Compare September 6, 2016 21:50

tallytalwar reviewed Sep 7, 2016
View changes

msmollin and others added 12 commits September 7, 2016 13:14

updateProxyTiles check for minZoom. equals function check for minZoom.

828eec2

Min zoom working for main sources but not for sub-sources

8b29cac

trying to figure out how to cancel a subtask that shouldn't be loaded

12d6b7d

A subTask that shouldn't be loaded when lower than minZoom should loa…

31a6160

…d an empty texture.

Refactored min_zoom to be min_display_zoom

3fe442b

Implemented max_display_zoom

e21a935

#ifndef INT32_MAX for Android

817a73f

min_display_zoom equality check. min_display_zoom accessor rename.

80314b9

m_minDisplayZoom and m_maxDisplayZoom default to -1. min and max tile…

69ce261

…s are not culled with this value.

We limit the parent source by any attached raster source's min/max.

44153fe

Removed RasterSource::loadEmptyTexture

aeefe08

hallahan force-pushed the minZoom branch from 2c778a2 to aeefe08 Compare September 7, 2016 20:20

tallytalwar merged commit 94a0ac2 into tangrams:master Sep 8, 2016

min_display_zoom & max_display_zoom #944

min_display_zoom & max_display_zoom #944

hallahan commented Aug 30, 2016 •

edited

hallahan commented Sep 6, 2016

hallahan commented Sep 6, 2016

tallytalwar commented Sep 6, 2016

tallytalwar Sep 6, 2016

tallytalwar Sep 6, 2016 •

edited

hallahan Sep 6, 2016

tallytalwar Sep 6, 2016

hallahan commented Sep 7, 2016

tallytalwar Sep 7, 2016

hallahan Sep 7, 2016

tallytalwar Sep 7, 2016

tallytalwar Sep 7, 2016

hallahan Sep 7, 2016

hallahan Sep 7, 2016

tallytalwar commented Sep 7, 2016

tallytalwar commented Sep 7, 2016

min_display_zoom & max_display_zoom #944

min_display_zoom & max_display_zoom #944

Conversation

hallahan commented Aug 30, 2016 • edited

hallahan commented Sep 6, 2016

hallahan commented Sep 6, 2016

tallytalwar commented Sep 6, 2016

Choose a reason for hiding this comment

tallytalwar Sep 6, 2016 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hallahan commented Sep 7, 2016

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

tallytalwar commented Sep 7, 2016

tallytalwar commented Sep 7, 2016

hallahan commented Aug 30, 2016 •

edited

tallytalwar Sep 6, 2016 •

edited