Merge V1.0.0 dev into Master for v1.00 Release#2676
Merged
Conversation
Changed tileoven to tilemill. Also removed some unecessary stuff.
- Updated regex for checking version name - Removed version[1] check, didn't seem necessary.
…0.0-dev branch." This reverts commit 7cd7950.
This reverts commit fc2fc65.
- Added more text to describe clearly which test file is being executed. - Fixed regex in duplicate_module for dedupe
All DELETE calls appear to now require a header of 'content-length'. ref: https://stackoverflow.com/questions/31864707/node-socket-hang-up-error-with-http
Fixes issue 2644
…searched when going to 5.0.1 or later). Also updated versions of JSV and backbone to latest versions (JSV: 4.0.2; backbone: 1.1.3). (#2652) Confirmed tests pass and manual test of the app. Merging.
* Updating as many dependent module versions as I can (for the ones that don't break something). Here are the ones that I updated:
• connect
○ Updated to latest version 3.6.6.
• express
○ Updated to latest version 4.16.4.
• sqlite3
○ Current version is 3.1.13. Broke on next version 4.0.0. Needs to be researched. Latest version is 4.0.6.
• carto
○ Current version is 0.18.2. Broke on next version 1.0.0. Needs to be researched. Latest version is 1.2.0.
• chrono
○ Updated to latest version 1.0.5.
• generic-pool
○ Updated to latest version 3.5.0.
• glob
○ Updated to latest version 7.1.3.
• jsdom
○ Updated to latest version 13.2.0.
• mkdirp
○ Updated to latest version 0.5.1.
• request
○ Updated to latest version 2.88.0.
• rimraf
○ Updated to latest version 2.6.3.
• sax
○ Updated to latest version 1.2.4.
• step
○ Updated to latest version 1.0.0.
• underscore
○ Updated to latest version 1.9.1.
• xmlhttprequest
○ Updated to latest version 1.8.0.
* Removed package-lock and let npm update it since I changed a whole bunch of dependent package versions.
… 5, there was no more support for the browser version of semver (build in <v5.0.0). It was being included in Route.bones for use on the browser but never being used in the browser so I removed it. (#2659)
Upgraded carto to v1.0.1: * Fixed carto.tree.Reference in core.bones - created carto reference before calling setVersion, due to new carto structure. * Fixed mapnik xml first attribute error XML is coming now as JSON with new Carto. Added '.data' to get just the actual XML. * Fixed text for invalid stylesheet -With carto 1.x, it no longer throws an error when compiling an invalid stylesheet, it just passes up an error message. - Updated to check for error message, than throw an error - Updated test to look for simplified error message. * Revert "Fixed text for invalid stylesheet" This reverts commit 894cdf3. * Fixed issue of Carto not returning error from compile - With carto 1.x, it no longer throws an error if the stylesheet is not valid, but just returns an empty data response - Added check to see if returned data is null, then throws an error, so the client can still display the error. - However, client is throwing an additional error that still needs to be investigated. * Updated carto to v1.0.1 to fix bug - Carto had bug in util.js on null value. Carto fixed with v1.0.1. - Updated package.json to use carto 1.0.1. * Removed vscode config files * Update package-lock.json
…es and postgis, and downloading osm data and loading it into postgres.
* Updated mapnik to v3.7.2 for csytsma-issue-2636 * Updated references to mapbox -Updated references from github.com/mapbox/tilemill to github.com/tilemill-project/tilemill
* Added install and osm load utiliites and updated docs for v1.0.0. * Moved updates to dev tasks (running tests, updating docs, etc.) from README to CONTRIBUTING. * Updated CHANGELOG.md for v1.0.0 release * Updated dependencies and added back quick install * Fixed bugs in run scripts and added -d option to loadosm script. * Updated install to not have hardcoded versions for tilemill (other than for testing the script). * Added a comment to installtilemill.sh to mention where the nvm install instructions came from. * Removed issue branch from intalltilemill script in preparation for pulling it into v1.0.0-dev. * Updated runclient.sh to check if port is open Instead of waiting for 12 seconds, check if the localhost:20009 port is available, before proceeding to open browser. * Updating manual with changes that were made to the gh-docs. * Fixes to scripts to make them more robust. Fixed the directory in loadosm.sh to use the config.json root if available or to use the default if not. Also made it properly handle spaces in the directory path. Removed use of UTILS_DIR in scripts where it was not needed and made it relative elsewhere. Changed the loadosm.sh to put a copy of defaults.style into the osm data dir (if not there) and then to use that one in case you have customized it. changed the name of runtilemill.sh to tilemill.sh and moved it to the root. * Removing the test version. * Some fixes/improvements to the run scripts.
Collaborator
|
Looks good. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.