search

credomane / FactorioMods_FactorioMaps

Jeroon's Factorio Maps mod
http://www.factorioforums.com/14582
47 stars 7 forks source link

Make Map Work on Web Servers #1

Closed liam1241 closed 7 years ago

liam1241 commented 7 years ago

Google Maps updated their API. The map won't load properly when uploaded to a web server (making it available on a website). This code change fixes this while still maintaining local support. You do have to get a Google Maps API key for uploading it to a web server but they are free with a Google account for the first 25,000 map loads per 24 hours, which isn't bad.

liam1241 commented 7 years ago

I found and used the mod today and ran into these problems.

credomane commented 7 years ago

Sorry about this. I rewrote the mod months ago and left the rewrite sitting on a branch.

Merged it into master but unfortunately that breaks this PR due to the file you edited no longer existing. If I merge your PR then merge in my rewrite branch it effectively deletes your change due to Files/index_html.lua no longer existing. There is probably some git magic that I'm incapable of that would have allowed me to merge everything and keep your changes just fine but I couldn't figure it out. :(

Can I get you to make these changes with the new master and open a new PR? The file you want is fm/generateIndex.lua. If you don't want to then I can do it. I'm just wanting to make sure you get proper credit in the commit history. Sorry again about this.

liam1241 commented 7 years ago

Hi, thanks for the reply. I submitted a new pull request. I didn't see your message until weekend. :) Here is the link to the new pull request.