migrated to jsdelivr

L0laapk3 · Dec 22, 2018 · fc43d5b · fc43d5b
1 parent 7975cef
commit fc43d5b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/auto.py b/auto.py
@@ -47,7 +47,7 @@ def parseArg(arg):
 if "noupdate" not in kwargs:
     try:
         print("Checking for updates")
-        latestUpdates = json.loads(urllib2.urlopen('https://rawgit.com/L0laapk3/FactorioMaps/master/updates.json', timeout=10).read())
+        latestUpdates = json.loads(urllib2.urlopen('https://cdn.jsdelivr.net/gh/L0laapk3/FactorioMaps@latest/updates.json', timeout=10).read())
         with open("updates.json", "r") as f:
             currentUpdates = json.load(f)
 

diff --git a/autorun.template.lua b/autorun.template.lua
@@ -1,7 +1,7 @@
 fm.autorun = {
     HD = false,
     day = true,                     -- note: snapshots in the same timeline should have the same day/night settings for now (this will be possible in the future)
-    night = false,
+    night = true,
     around_build_range = 5.2,		-- max range from buildings that images will be saved. Feel free to crank this up to very large numbers, it will only render chunks that already exist, it will not generate new ones.
     around_smaller_range = 1.2,		-- same as above, but smaller range for the following entity types:
     smaller_types = {"lamp", "electric-pole", "radar", "straight-rail", "curved-rail", "rail-signal", "rail-chain-signal", "locomotive", "cargo-wagon", "fluid-wagon", "car"},

diff --git a/index.html.template b/index.html.template
@@ -197,8 +197,8 @@
 	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
 
 	<!-- HERE: ESPECIALLY THESE TWO -->
-	<link rel="stylesheet" href="https://rawgit.com/L0laapk3/Leaflet.OpacityControls/master/Control.Opacity.css" />
-	<script src="https://rawgit.com/L0laapk3/Leaflet.OpacityControls/master/Control.Opacity.js" ></script>
+	<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/L0laapk3/Leaflet.OpacityControls@1/Control.Opacity.css" />
+	<script src="https://cdn.jsdelivr.net/gh/L0laapk3/Leaflet.OpacityControls@1/Control.Opacity.js" ></script>
 
 
 	<script src="mapInfo.js"></script>

diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "L0laapk3_FactorioMaps",
-    "version": "2.3.0",
+    "version": "2.4.0",
     "title": "FactorioMaps",
     "author": "L0laapk3",
     "contact": "https://github.com/L0laapk3/",

diff --git a/ref.py b/ref.py
@@ -184,7 +184,7 @@ def getBase64(number, isNight): #coordinate to 18 bit value (3 char base64)
         if len(compareList) > 0:
             print("comparing %s existing images" % len(compareList))
             treshold = .3 * Image.open(os.path.join(toppath, "Images", *compareList[0]).replace(ext, outext)).size[0] ** 2
-            print(treshold)
+            #print(treshold)
             #compare(compareList[0], treshold=treshold, basePath=os.path.join(toppath, "Images"), new=str(newMap["path"]))
             resultList = pool.map(partial(compare, treshold=treshold, basePath=os.path.join(toppath, "Images"), new=str(newMap["path"])), compareList, 128)
 

diff --git a/updates.json b/updates.json
@@ -9,5 +9,6 @@
     "2.1.0": "Block all 404 request, The client now knows exactly which images exist. (Breaks old maps)",
     "2.2.0": "Significantly increased image quality and file size at the cost of some processing time.",
     "2.2.1": "Fixed problem with missing graphics.",
-    "2.3.0": "Fixed problems with the deduplicator."
+    "2.3.0": "Fixed problems with the deduplicator.",
+    "2.4.0": "Fixed a bug in the image deduplicator."
 }