From d73d55acb03ba0be7ccbc8b13d794b356fcce271 Mon Sep 17 00:00:00 2001
From: Crawlerop <gitanon@ws01.co>
Date: Thu, 5 Nov 2020 08:15:23 +0700
Subject: [PATCH] newads

---
 lpadsjs/editormain.js      | 14 ++++++++++++--
 lpadsjs/mapads.js          |  2 +-
 lpadsjs/mapads_marker.html |  7 ++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lpadsjs/editormain.js b/lpadsjs/editormain.js
index a4c7d55..b54a9ef 100644
--- a/lpadsjs/editormain.js
+++ b/lpadsjs/editormain.js
@@ -53,7 +53,12 @@ function fixHash(adData) {
     let overrides = repdata
     for (i=0;i<overrides.length;i++) {
         if (overrides[i].target.hash == undefined) {
-            if (adData.adName == overrides[i].target.adName && adBaseSite.adName == overrides[i].target.adBaseSite) {
+            if (overrides[i].target.adPlace == undefined) {
+                if (adData.adName == overrides[i].target.adName && adData.adBaseSite == overrides[i].target.adBaseSite) {
+                    overrides[i].target.adPlace = adData.adPlace
+                }
+            }
+            if (adData.adPlace == overrides[i].target.adPlace) {
                 overrides[i].target.hash = adData.hash
                 return
             }
@@ -66,7 +71,12 @@ function fixHash2(adData) {
     let overrides = repdata
     for (i=0;i<overrides.length;i++) {
         if (overrides[i].new.hash == undefined) {
-            if (adData.adName == overrides[i].new.adName && adBaseSite.adName == overrides[i].new.adBaseSite) {
+            if (overrides[i].new.adPlace == undefined) {
+                if (adData.adName == overrides[i].new.adName && adData.adBaseSite == overrides[i].new.adBaseSite) {
+                    overrides[i].new.adPlace = adData.adPlace
+                }
+            }
+            if (adData.adPlace == overrides[i].new.adPlace) {
                 overrides[i].new.hash = adData.hash
                 return
             }
diff --git a/lpadsjs/mapads.js b/lpadsjs/mapads.js
index d5131ab..20cffc2 100644
--- a/lpadsjs/mapads.js
+++ b/lpadsjs/mapads.js
@@ -177,7 +177,7 @@ function parseAds(mapad) {
                 adPromolyr = {"promoTitle": adPromoTxt[0], "promoDesc": adPromoTxt[1], "promoButton": adPromoTxt[2]}
                 adData = {"adImage": adImg, "adPromo": adPromolyr}
             }
-            ret.mapAds.push({"adName":adName,"adPlace":adPlace,"adLocation":adLocData.join(", "),"adLink":adUrlLink,"adSite":adBaseSite,"adWhy":adWta,"promoData":adData,"adPinImage":adPinlet,"id":adId,"hash":hash_md5(adName+adBaseSite)})
+            ret.mapAds.push({"adName":adName,"adPlace":adPlace,"adLocation":adLocData.join(", "),"adLink":adUrlLink,"adSite":adBaseSite,"adWhy":adWta,"promoData":adData,"adPinImage":adPinlet,"id":adId,"hash":hash_md5(adName+adBaseSite+adPlace)})
             adId++
         })
     } else {
diff --git a/lpadsjs/mapads_marker.html b/lpadsjs/mapads_marker.html
index 707c220..5b732c4 100644
--- a/lpadsjs/mapads_marker.html
+++ b/lpadsjs/mapads_marker.html
@@ -349,7 +349,12 @@
                 function fixHash(adData) {
                     for (i=0;i<overrides.length;i++) {
                         if (overrides[i].target.hash == undefined) {
-                            if (adData.adName == overrides[i].target.adName && adBaseSite.adName == overrides[i].target.adBaseSite) {
+                            if (overrides[i].target.adPlace == undefined) {
+                                if (adData.adName == overrides[i].target.adName && adData.adBaseSite == overrides[i].target.adBaseSite) {
+                                    overrides[i].target.adPlace = adData.adPlace
+                                }
+                            }
+                            if (adData.adPlace == overrides[i].target.adPlace) {
                                 overrides[i].target.hash = adData.hash
                                 return
                             }