diff --git a/index.html b/index.html index 54628b14..a79d91a7 100644 --- a/index.html +++ b/index.html @@ -7721,7 +7721,6 @@ - diff --git a/package.json b/package.json index 2beb7a34..01ad9e7f 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "delaunator": "^5.0.0", "flatqueue": "^2.0.3", "lineclip": "^1.1.5", - "polylabel": "^1.1.0" + "polylabel": "^1.1.0", + "rgbquant": "^1.1.2" } } diff --git a/src/libs/rgbquant.min.js b/src/libs/rgbquant.min.js deleted file mode 100644 index 1cc0104e..00000000 --- a/src/libs/rgbquant.min.js +++ /dev/null @@ -1,2 +0,0 @@ -// © 2015, Leon Sorokin, MIT -(function(){function t(t){var s;t=t||{},this.method=t.method||2,this.colors=t.colors||256,this.initColors=t.initColors||4096,this.initDist=t.initDist||.01,this.distIncr=t.distIncr||.005,this.hueGroups=t.hueGroups||10,this.satGroups=t.satGroups||10,this.lumGroups=t.lumGroups||10,this.minHueCols=t.minHueCols||0,this.hueStats=this.minHueCols?new i(this.hueGroups,this.minHueCols):null,this.boxSize=t.boxSize||[64,64],this.boxPxls=t.boxPxls||2,this.palLocked=!1,this.dithKern=t.dithKern||null,this.dithSerp=t.dithSerp||!1,this.dithDelta=t.dithDelta||0,this.histogram={},this.idxrgb=t.palette?t.palette.slice(0):[],this.idxi32=[],this.i32idx={},this.i32rgb={},this.useCache=!1!==t.useCache,this.cacheFreq=t.cacheFreq||10,this.reIndex=t.reIndex||0==this.idxrgb.length,this.colorDist="manhattan"==t.colorDist?n:r,0>>0;s.idxi32[i]=r,s.i32idx[r]=i,s.i32rgb[r]=t})}function i(t,i){this.numGroups=t,this.minCols=i,this.stats={};for(var r=-1;r>8,b=(16711680&x)>>16,m=this.nearestColor(x),v=255&m,x=(65280&m)>>8,m=(16711680&m)>>16;if(h[f]=255<<24|m<<16|x<<8|v,this.dithDelta)if(this.colorDist([p,g,b],[v,x,m])>8,A=(16711680&h[D])>>16,I=Math.max(0,Math.min(255,I+y*M)),P=Math.max(0,Math.min(255,P+w*M)),M=Math.max(0,Math.min(255,A+S*M)),h[D]=255<<24|M<<16|P<<8|I)}}}return h},t.prototype.buildPal=function(t){if(!(this.palLocked||0this.colors){for(var i,r=t.length,s={},e=0,h=!1,n=0;n>8,(16711680&t)>>16]}),o=r=a.length,u=this.initDist;if(o>this.colors){for(;o>this.colors;){for(var l=[],n=0;n3*this.colors?this.initDist:this.distIncr}if(o>24!=0&&(this.hueStats&&this.hueStats.check(i),i in r?r[i]++:r[i]=1)},t.prototype.colorStats2D=function(e,h){var t=this.boxSize[0],i=this.boxSize[1],n=t*i,i=function(t,i,r,s){for(var e=t%r,h=i%s,n=t-e,a=i-h,o=[],u=0;u>24!=0&&(o.hueStats&&o.hueStats.check(i),i in a?a[i]++:i in s?++s[i]>=r&&(a[i]=s[i]):s[i]=1)})}),this.hueStats&&this.hueStats.inject(a)},t.prototype.sortPal=function(){var e=this;this.idxi32.sort(function(t,i){var r=e.i32idx[t],s=e.i32idx[i],t=e.idxrgb[r],i=e.idxrgb[s],r=a(t[0],t[1],t[2]),s=a(i[0],i[1],i[2]),t=t[0]==t[1]&&t[1]==t[2]?-1:c(r.h,e.hueGroups),t=(i[0]==i[1]&&i[1]==i[2]?-1:c(s.h,e.hueGroups))-t;if(t)return-t;t=+s.l.toFixed(2)-+r.l.toFixed(2);if(t)return-t;r=+s.s.toFixed(2)-+r.s.toFixed(2);return r?-r:void 0}),this.idxi32.forEach(function(t,i){e.idxrgb[i]=e.i32rgb[t],e.i32idx[t]=i})},t.prototype.nearestColor=function(t){t=this.nearestIndex(t);return null===t?0:this.idxi32[t]},t.prototype.nearestIndex=function(t){if((4278190080&t)>>24==0)return null;if(this.useCache&&""+t in this.i32idx)return this.i32idx[t];for(var i,r,s=1e3,e=[255&t,(65280&t)>>8,(16711680&t)>>16],h=this.idxrgb.length,n=0;n=this.cacheFreq;r=t[i++])this.i32idx[r]=this.nearestIndex(r)},i.prototype.check=function(t){this.groupsFull==this.numGroups+1&&(this.check=function(){});var i=255&t,r=(65280&t)>>8,s=(16711680&t)>>16,i=i==r&&r==s?-1:c(a(i,r,s).h,this.numGroups),r=this.stats[i],s=this.minCols;r.num++,r.num>s||(r.num==s&&this.groupsFull++,r.num<=s&&this.stats[i].cols.push(t))},i.prototype.inject=function(i){for(var t=-1;t { - const noTrack = !location.hostname || window.localStorage.getItem("noTrack"); - - const { - screen: {width, height}, - navigator: {language}, - location: {hostname, pathname, search}, - document: {referrer} - } = window; - - const website = "4f6fd0ae-646a-4946-a9da-7aad63284e48"; - const root = "https://fmg-stats.herokuapp.com"; - const screen = `${width}x${height}`; - const url = `${pathname}${search}`; - - const post = (url, data) => { - const req = new XMLHttpRequest(); - req.open("POST", url, true); - req.setRequestHeader("Content-Type", "application/json"); - req.send(JSON.stringify(data)); - }; - - const collect = (type, params) => { - if (noTrack) return; - - const payload = {website, hostname, screen, language, cache: false}; - Object.keys(params).forEach(key => { - payload[key] = params[key]; - }); - - post(`${root}/api/collect`, {type, payload}); - }; - - collect("pageview", {url, referrer}); - window.track = (event_type = "reach", event_value = "") => collect("event", {event_type, event_value, url}); -})(window); diff --git a/src/modules/ui/heightmap-editor.js b/src/modules/ui/heightmap-editor.js index 08dec214..03c7932c 100644 --- a/src/modules/ui/heightmap-editor.js +++ b/src/modules/ui/heightmap-editor.js @@ -1,3 +1,5 @@ +import RgbQuant from "rgbquant"; + import {heightmapTemplates} from "config/heightmap-templates"; import {createTypedArray, last} from "utils/arrayUtils"; import {getColorScheme, getHeightColor} from "utils/colorUtils"; diff --git a/yarn.lock b/yarn.lock index 9dd0c4d5..6240babb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -209,6 +209,11 @@ resolve@^1.22.1: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +rgbquant@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/rgbquant/-/rgbquant-1.1.2.tgz#d95e889a8fcb1e6c1a4fa2ccc8be3a41a2fcd185" + integrity sha512-AGuKVeUUFW5rhm4Eu/7SXQRSxs3MoXIGKP4i/5Rok89QBrOu9+ytWezuxHhCsHT9Y6z+sGPKL9PKo6X8tZNUaw== + robust-predicates@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.1.tgz#ecde075044f7f30118682bd9fb3f123109577f9a"