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.

Sign up for GitHub

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

[DO NOT MERGE] Openlayers #441

Open
wants to merge 15 commits into
base: devel
Choose a base branch
from
Open

[DO NOT MERGE] Openlayers #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f2b235c
Merge remote-tracking branch 'origin/devel'
enriquetuya Dec 13, 2016
69bac6e
Merge remote-tracking branch 'origin/devel'
enriquetuya Jan 16, 2017
1c99037
Merge remote-tracking branch 'origin/devel'
enriquetuya Feb 15, 2017
8423178
Loading works, but nothing is displayed
Jun 16, 2017
63e0583
Bugfixes
Jun 16, 2017
20821ec
css bugfix
Jun 19, 2017
bb8a443
Bugfix for redraw and clipping
Jun 19, 2017
8c78738
Bugfix for map translation
Jun 19, 2017
7807cd4
Bugfix for zoom buttons
Jun 19, 2017
7406941
OpenSeamap overlay
Jun 19, 2017
4598dc1
Some build bugfixes
Jun 20, 2017
8f8db80
Bugfix for build
Jun 20, 2017
e5c09bf
Merge branch 'master' into openlayers
Jun 20, 2017
7aa30ea
Build bugfixes
Jun 20, 2017
b3da4f8
Bugfix for select
Jun 22, 2017
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: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ JSDEPS= \
$(LIBS)/loggly-jslogger/src/loggly.tracker.js \
$(LIBS)/cartodb.js/cartodb.js \
$(LIBS)/cartodb.js/cartodb.mod.torque.js \
$(LIBS)/clipboard.js/clipboard.min.js
$(LIBS)/clipboard.js/clipboard.min.js \
$(LIBS)/bower-ol3/build/ol.js

CSSDEPS= \
$(LIBS)/font-awesome/css/font-awesome.min.css \
Expand Down Expand Up @@ -58,14 +59,14 @@ js-build/build-succeded: js-dojo-build/build-succeded js-build/deps.js js-build/
(cd js-dojo-build; find . -type f \! -name "*.js") | while read name; do cp "js-dojo-build/$$name" "js-build/$$name"; done
(cd js/libs; find . -type d) | while read name; do mkdir -p "js-build/libs/$$name"; done
(cd js/libs; find . -type f \! -name "*.js") | while read name; do cp "js/libs/$$name" "js-build/libs/$$name"; done
cp js-dojo-build/app/app.js.uncompressed.js js-build/app/app.js.uncompressed.js
cp js-dojo-build/app/app.js js-build/app/app.js.uncompressed.js
cp js-dojo-build/app/nls/* js-build/app/nls/
cp js-dojo-build/app/TabletMeta.js js-build/app/TabletMeta.js
# Minify app.js
node_modules/.bin/uglifyjs js-build/app/app.js.uncompressed.js --screw-ie8 --keep-fnames --stats -o js-build/app/app.js
touch $@

js-build/deps.js: $(JSDEPS) js/app/CanvasLayer.js
js-build/deps.js: $(JSDEPS)
mkdir -p js-build
for name in $^; do cat $$name; echo; done > $@

Expand Down
3 changes: 2 additions & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"easyXDM": "~2.4.17",
"cartodb.js": "https://github.com/SkyTruth/cartodb.js-bower.git#3.15.8-skytruth-4",
"dojo-theme-flat": "https://github.com/Esri/dojo-theme-flat.git",
"clipboard.js": "~0.2.0"
"clipboard.js": "~0.2.0",
"bower-ol3": "ol3#^3.4.0"
}
}
Loading