Skip to content

Pull request #479

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

Open
mefrese wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Pull request #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e38482
Added comments and code to source js for basemap, crs, layer switchin…
Jun 20, 2022
d4df26d
updated how storymap js handles custom images and icons in the map UI
Jun 20, 2022
eb9111f
updated the icon-image generation to use 1 element array for images
Jun 20, 2022
f2f4379
final changes for first round of integration of NFIS features to Stor…
Jun 22, 2022
f84c837
changes for adding a new projection
Jul 27, 2022
b611072
import statment changes
Jul 28, 2022
6ac8835
Upgraded leaflet and proj4leaflet to 180/102, added EPSG3978 support,…
jeannettestrand Aug 8, 2022
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
2,772 changes: 1,384 additions & 1,388 deletions compiled/js/storymap.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
},
"dependencies": {
"adm-zip": "^0.5.4",
"leaflet": "^0.7.2",
"leaflet": "^1.8.0",
"mini-css-extract-plugin": "^1.3.9",
"proj4leaflet": "^1.0.2",
"prompt": "^1.1.0",
"simple-git": "^2.36.1",
"trash-cli": "^4.0.0",
Expand All @@ -26,6 +27,8 @@
"jstrace": "^0.3.0",
"less": "^3.13.0",
"less-loader": "^7.1.0",
"mocha": "^10.0.0",
"mocha-phantomjs": "^4.1.0",
"npm-run-all": "^4.1.5",
"run-all": "^1.0.1",
"run-s": "0.0.0",
Expand Down
12 changes: 6 additions & 6 deletions src/js/core/Util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ export function extend(/*Object*/ dest) /*-> Object*/ { // merge src properties
}

/**
* Implement mixin behavior. Based on
* Implement mixin behavior. Based on
* https://blog.bitsrc.io/understanding-mixins-in-javascript-de5d3e02b466
* @param {class} cls
* @param {...class} src
* @param {class} cls
* @param {...class} src
*/
export function classMixin(cls, ...src) {
for (let _cl of src) {
Expand Down Expand Up @@ -145,7 +145,7 @@ export function htmlify(str) {
str = Emoji(str);
}
if (str.match(/<p>[\s\S]*?<\/p>/)) {

return str;
} else {
return "<p>" + str + "</p>";
Expand All @@ -158,7 +158,7 @@ export function getUrlVars(string) {
hash,
hashes;
str = string.toString();
if (str.match('&#038;')) {
if (str.match('&#038;')) {
str = str.replace("&#038;", "&");
} else if (str.match('&#38;')) {
str = str.replace("&#38;", "&");
Expand Down Expand Up @@ -189,7 +189,7 @@ export const ratio = {
}
return s;
},

r16_9: function(size) {
if (size.w !== null && size.w !== "") {
return Math.round((size.w / 16) * 9);
Expand Down
Loading