Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gallery file upgrades #1415

Merged
merged 5 commits into from
Feb 27, 2014
Merged

Gallery file upgrades #1415

merged 5 commits into from
Feb 27, 2014

Conversation

emackey
Copy link
Contributor

@emackey emackey commented Jan 28, 2014

Some data file upgrades that have been sitting on other branches for too long.

The new data is already covered by this section of LICENSE.md:

### Public domain data from Natural Earth

Free vector and raster map data @ naturalearthdata.com

Terms of use: http://www.naturalearthdata.com/about/terms-of-use/
@mramato
Copy link
Contributor

mramato commented Jan 28, 2014

I'm not sure I see a reason for these going into master yet.

simple.czml contains CZML properties not currently handled in master (they need to be ported front another branch). While these properties get ignored, it would be confusing for anyone that uses the file as a reference.

As for the GeoJSON, where did it come from and do we have the rights to redistribute it? Further more, is it a good example? One that has meta-data in it might be better to use. I've had a Sandcastle example on my to-do for some time (and may finally get to it with the other work I'm doing in the dynamicScene-refactor branch).

@mramato
Copy link
Contributor

mramato commented Jan 28, 2014

Now that you've opened #1417 my above comments are irrelevant 😄

@emackey
Copy link
Contributor Author

emackey commented Jan 28, 2014

The license is already covered by our Natural Earth block in LICENSE.md. See the comments on the git changeset by expanding the ... above.

I'm open to using better GeoJSON example(s) if you like. Better metadata might be good.

@mramato
Copy link
Contributor

mramato commented Jan 28, 2014

I'm going to take another pass at simple.czml, some of the new description properties in there are rough around the edges (which is on me, since I'm the one that generated this version).

@shunter
Copy link
Contributor

shunter commented Jan 28, 2014

Yes, the US states GeoJSON file (which is actually TopoJSON) was generated by me, using the tool at https://github.com/mbostock/world-atlas, which uses the public-domain Natural Earth data.

@emackey
Copy link
Contributor Author

emackey commented Feb 21, 2014

We should get this in before the next release, if possible.

@mramato
Copy link
Contributor

mramato commented Feb 22, 2014

Don't worry @emackey we will definitely have update examples. We may even have totally new ones. Depends on what I can get done in time. At the very least we'll have the existing demos updated with good descriptions and a GeoJSON demo.

Removed Landsat and added some better descriptions.  File is much smaller now.
@mramato
Copy link
Contributor

mramato commented Feb 27, 2014

@shunter or @emackey can you checkout the slightly updated simple.czml I just pushed. Particularly the descriptions (by clicking on each item). This may come as a shock to you, but I occasionally make typos. Assuming everything is okay, one of you can merge.

@mramato
Copy link
Contributor

mramato commented Feb 27, 2014

Some suggested-offline tweaks are done. This is ready.

shunter added a commit that referenced this pull request Feb 27, 2014
@shunter shunter merged commit 4071376 into master Feb 27, 2014
@shunter shunter deleted the gallery branch February 27, 2014 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants