diff --git a/lpadsjs/editormain.js b/lpadsjs/editormain.js index 5e048e3..5055491 100644 --- a/lpadsjs/editormain.js +++ b/lpadsjs/editormain.js @@ -11,6 +11,8 @@ var dist = 1; up = new URLSearchParams(window.location.search) var here = false var cors = false +var blacklist = [] +var placeBlacklist = [] if (up.get("here") == "true") { here = true @@ -188,7 +190,7 @@ function start2() { } catch (e) { return } - adResp = parseAds(adProto) + adResp = parseAds(adProto, blacklist, placeBlacklist) if (adResp.noAds == true) { console.warn("No ads found on "+up.get('lat')+", "+up.get('lng')+"!") setTimeout(start2, 200) diff --git a/lpadsjs/mapads.js b/lpadsjs/mapads.js index 20cffc2..aa58d52 100644 --- a/lpadsjs/mapads.js +++ b/lpadsjs/mapads.js @@ -154,34 +154,56 @@ d = add(d, oldd); return rhex(a) + rhex(b) + rhex(c) + rhex(d); } -function parseAds(mapad) { +function parseAds(mapad, blacklist=[], placeblacklist=[]) { var ret = {"noAds": false, "mapAds": null} var listdata = mapad[MAPAD_ADLIST] adId = 0 if (listdata !== null) { ret.mapAds = [] listdata.forEach(function(ldata){ - adPlace = ldata[MAPAD_ADMAPPLACE] - adName = ldata[MAPAD_ADNAME] - adLocData = [ldata[MAPAD_ADLOCATION][MAPAD_ADLL][MAPAD_ADLOCATIONLAT].toString(), ldata[MAPAD_ADLOCATION][MAPAD_ADLL][MAPAD_ADLOCATIONLNG].toString()] - adUrlLink = ldata[MAPAD_ADLINKS][MAPAD_ADCLICK] - adBaseSite = ldata[MAPAD_ADSITE][MAPAD_ADSITE_BASESITE] - adWtaP = ldata[MAPAD_ADSITE][MAPAD_ADSITE_WTA] - adWta = adWtaP + ". " + ldata[MAPAD_ADSITE][MAPAD_ADSITE_WTAARRAY].join(" ") - adPinlet = ldata[MAPAD_ADLOCATION][MAPAD_ADLOCATION_PINLET] - adData = null - if (ldata[MAPAD_ADDATA] != null) { - adImg = ldata[MAPAD_ADDATA][MAPAD_ADDATA_IMAGE] - adUrlLink = ldata[MAPAD_ADDATA][MAPAD_ADDATA_LINK] - adPromoTxt = ldata[MAPAD_ADDATA][MAPAD_ADDATA_PROMO] - adPromolyr = {"promoTitle": adPromoTxt[0], "promoDesc": adPromoTxt[1], "promoButton": adPromoTxt[2]} - adData = {"adImage": adImg, "adPromo": adPromolyr} + let granted = true + if (blacklist.length >= 1) { + for (i=0;i= 1) { + for (i=0;i