Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e3e961f
satellite and osm both work -- need layer mgmt
georgejhunt Apr 19, 2019
025926c
add in functioning layeerswitcher
georgejhunt Apr 20, 2019
d65138e
satellite tiles work
georgejhunt Apr 20, 2019
900626a
adam's new boxes
georgejhunt Apr 27, 2019
945d3b4
last minute changes to bboxes
georgejhunt Apr 29, 2019
8b14d49
new region names
georgejhunt Apr 29, 2019
fcaa872
version0.2 regions.json
georgejhunt Apr 30, 2019
a60e297
seq numbers ala adam
georgejhunt Apr 30, 2019
eabd1e2
add in switcher to osm-source, update console with new directory name…
georgejhunt May 6, 2019
96c2f53
try to fix security problems
georgejhunt May 6, 2019
251dbf2
remove duplicate
georgejhunt May 6, 2019
b464721
ignore python_mbtiles if maps git
georgejhunt May 8, 2019
a9c6494
start with basic openlayers map
georgejhunt May 8, 2019
0dbac13
add alias for ol5-layerswitcher
georgejhunt May 8, 2019
f2454f1
add build dir to gitignore
georgejhunt May 8, 2019
9764105
Update readme.md
georgejhunt May 8, 2019
d2cc560
Update readme.md
georgejhunt May 8, 2019
5f751a9
move readme for Josh to generate-regions
georgejhunt May 8, 2019
4316ae1
Update readme.md
georgejhunt May 8, 2019
78d5672
get simple to work on clean machine
georgejhunt May 8, 2019
087db03
Update readme.md
georgejhunt May 8, 2019
84a81e1
get tileserver.php
georgejhunt May 8, 2019
e612801
Merge branch 'simple' of https://github.com/georgejhunt/maps into simple
georgejhunt May 8, 2019
bd93a2a
need assets directory
georgejhunt May 8, 2019
8473c7c
include the osm style with zoom 2 ocean
georgejhunt May 8, 2019
47ceee7
get the tileserver.php locally from repo
georgejhunt May 8, 2019
3c0057f
add in the osm style that includes ocean at zoom 2
georgejhunt May 8, 2019
ada5520
Merge branch 'simple' of https://github.com/georgejhunt/maps into simple
georgejhunt May 8, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
generate-regions/output/
generate-regions/pack/node_modules/
generate-regions/pack/build
generate-regions/pack/assets
generate-regions/pack/main*
generate-regions/pack/index*
generate-regions/ol-parcel-bundler/node_modules/
generate-regions/ol-browserify
generate-regions/ol-parcel-bundler/dist/
generate-regions/ol-parcel-bundler/.cache
generate-regions/tilelive/
generate-regions/extracts/
osm-source/base/build
generate-regions/python_mbtiles/
osm-source/*/build
osm-source/base/dist
osm-source/test/build
osm-source/test/dist
Expand Down
8 changes: 0 additions & 8 deletions docs/readme.md

This file was deleted.

17 changes: 12 additions & 5 deletions generate-regions/1setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ if [ "$MR" == "" ];then
exit 1
fi

# there's an environment variable which should impact the TARGET directory --but
# right now it is hard coded -- so keep it that way
TARGET_URL=/library/www/html/temp
mkdir -p $TARGET_URL/assets

# set up the output/input directors for pipeline
# all steps including generation of extracts done on SSD
mkdir -p $MR_SSD/output/stage1
Expand Down Expand Up @@ -45,7 +50,7 @@ if [ ! -d "$MR_SSD/pack/node_modules" ];then
npm install --save-dev html-webpack-plugin
npm install --save-dev ol-mapbox-style ol babel/core
# add the following to package.json
sed -i 's/.*test.*/"babel": "babel --presets es2015 ..\/src\/main.js -o ..\/build\/main.bundle.js",\
sed -i 's/.*test.*/"babel": "babel --presets es2015 .\/main.js -o .\/build\/main.bundle.js",\
"start": "webpack-dev-server --mode=development",\
"build": "webpack --mode=production"/' $MR_SSD/pack/package.json

Expand All @@ -55,7 +60,7 @@ const CopyPlugin = require('copy-webpack-plugin');
const HtmlPlugin = require('html-webpack-plugin');

module.exports = {
entry: '../src/main.js',
entry: './main.js',
output: {
path: path.resolve(__dirname, 'build'),
filename: 'main.js'
Expand All @@ -81,7 +86,7 @@ module.exports = {
]
},
plugins: [
//new CopyPlugin([{from: '../src/assets', to: 'assets'}]),
//new CopyPlugin([{from: './assets', to: 'assets'}]),
new HtmlPlugin({
template: './index.html'
})
Expand All @@ -107,6 +112,8 @@ fi

# create the csv file which is the spec for the regional extract stage2
$MR_SSD/../tools/mkcsv.py
# bboxes.geojson now generated during Admin Console install
#$MR_SSD/tools/mkjson.py > $MR_SSD/build/bboxes.geojson

# download the minumum resources to get the simple version of maps to work
wget http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden/regional-resources/detail.mbtiles -P $TARGET_URL
cp -rp ../osm-source/regional-base/assets/* $TARGET_URL/assets/
cp -rp ../osm-source/regional-base/tileserver.php $TARGET_URL/
Loading