Spritesheet rework

.eslintrc.json

@@ -32,9 +32,6 @@
     "google": true,
     "moment": false,
     "MarkerClusterer": true,
-    "isNotifyPoke": true,
-    "isTouchDevice": true,
-    "isMobileDevice": true,
 
     "noLabelsStyle": true,
     "darkStyle": true,
@@ -48,17 +45,35 @@
 
     "Store": true,
     "mapData": true,
+    "pokemonFormMap": true,
+    "formMap": true,
+    "spriteMap": true,
+    "spriteClass": true,
+    "getSprite": true,
+    "getSpriteMarker": true,
+    "pokemonIcon": true,
+    "pokemonSprite": true,
+    "pokestopSprite": true,
+    "pokestopMarker": true,
+    "gymSprite": true,
+    "gymMarker": true,
+    "spawnpointMarker": true,
+    "getPositionMarkers": true,
+    "positionMarker": true,
+    "setupPokemonMarker": true,
+    "updatePokemonMarker": true,
+    "isNotifyPoke": true,
+    "isTouchDevice": true,
+    "isMobileDevice": true,
+    "toTitleCase": true,
 
-    "pokemonSprites": true,
     "centerLat": true,
     "centerLng": true,
     "clusterImagePath": true,
     "showConfig": true,
 
-    "pageLoaded": true,
     "countMarkers": true,
-    "skel": true,
-    "setupPokemonMarker": true,
-    "updatePokemonMarker": true
+
+    "pageLoaded": true
   }
 }

.gitignore

@@ -17,11 +17,12 @@ src/
 _build
 _build_html
 beehive.*
-static/images/raid/*.png
-!static/images/raid/*_unknown.png
-static/icons-sprite.png
-static/icons-large-sprite.png
-static/icons/*.png
+static/icons/.tracking
+static/icons/pokemon/*.png
+static/icons/gyms/*.png
+!static/icons/gyms/heart.png
+static/spritesheet.png
+static/sass/sprites.scss
 static/css/custom.css
 static/js/custom.js
 *.csv
@@ -34,5 +35,5 @@ static/js/custom.js
 !contrib/supervisord/gen-workers.sh
 !contrib/supervisord/install-reinstall.sh
 !static/data/*
-!static/icons/hsl*.png
-!static/app/settings.json
+!static/app/settings.json
+static/data/sprite_map.json

.travis.yml

@@ -8,6 +8,9 @@ python:
   - 2.7
 
 # Install steps MUST succeed or will immediately halt the build.
+before_install:
+  - sudo apt-get install libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++
+
 install:
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install --lts=boron
   - pip install flake8

Gruntfile.js

@@ -2,11 +2,14 @@ module.exports = function (grunt) {
 
     // load plugins as needed instead of up front
     require('jit-grunt')(grunt, {
-        unzip: 'grunt-zip'
+        unzip: 'grunt-zip',
+        pngmin: 'grunt-pngmin'
     })
 
     var path = require('path')
     var fs = require('fs')
+    var buildIcons = require('./static/js/build_icons.js')
+    var buildSpritesheet = require('./static/js/build_spritesheet.js')
 
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
@@ -77,9 +80,10 @@ module.exports = function (grunt) {
             build: {
                 files: {
                     'static/dist/data/pokemon.min.json': 'static/data/pokemon.json',
+                    'static/dist/data/pokemon_forms.min.json': 'static/data/pokemon_forms.json',
                     'static/dist/data/moves.min.json': 'static/data/moves.json',
                     'static/dist/data/mapstyle.min.json': 'static/data/mapstyle.json',
-                    'static/dist/data/searchmarkerstyle.min.json': 'static/data/searchmarkerstyle.json',
+                    'static/dist/data/sprite_map.min.json': 'static/data/sprite_map.json',
                     'static/dist/locales/de.min.json': 'static/locales/de.json',
                     'static/dist/locales/fr.min.json': 'static/locales/fr.json',
                     'static/dist/locales/ja.min.json': 'static/locales/ja.json',
@@ -144,16 +148,31 @@ module.exports = function (grunt) {
                 src: 'static01.zip',
                 dest: 'static/'
             }
+        },
+        pngmin: {
+            compile: {
+                files: [
+                    {
+                      src: 'static/spritesheet.png',
+                      dest: 'static/'
+                    }
+                ],
+                options: {
+                    ext: '.png',
+                    force: true
+                }
+            }
         }
-
     })
 
+    grunt.registerTask('icons-build', 'Builds the icons for gyms and raids.', buildIcons)
+    grunt.registerTask('sp-build', 'Builds the spritesheet.', buildSpritesheet)
     grunt.registerTask('js-build', ['newer:babel', 'newer:uglify'])
     grunt.registerTask('css-build', ['newer:sass', 'newer:cssmin'])
     grunt.registerTask('js-lint', ['newer:eslint'])
     grunt.registerTask('json', ['newer:minjson'])
-
-    grunt.registerTask('build', ['clean', 'js-build', 'css-build', 'json', 'unzip'])
+    grunt.registerTask('build', ['clean', 'icons-build', 'sp-build', 'pngmin',
+                                 'js-build', 'css-build', 'json'])
     grunt.registerTask('lint', ['js-lint'])
     grunt.registerTask('default', ['build', 'watch'])
 }

README.md

@@ -5,7 +5,7 @@
 
 Live visualization of all the Pokémon (with option to show gyms, raids and PokéStops) in your area. This is a proof of concept that we can load all the Pokémon visible nearby given a location. Currently runs on a Flask server displaying Google Maps with markers on it.
 
-![Map](https://github.com/RocketMap/RocketMap/blob/develop/static/RocketMap.png)
+![Map](https://github.com/RocketMap/RocketMap/blob/develop/docs/_static/img/RocketMap.png)
 
 ## Features:
 

package.json

@@ -5,10 +5,12 @@
   "main": "Gruntfile.js",
   "dependencies": {
     "babel-preset-env": "^1.6.0",
+    "bluebird": "^3.5.1",
     "eslint": "^3.1.1",
     "eslint-config-standard": "^5.3.5",
     "eslint-plugin-promise": "^2.0.0",
     "eslint-plugin-standard": "^2.0.0",
+    "file-changed": "^1.2.1",
     "grunt": "^0.4.5",
     "grunt-babel": "^6.0.0",
     "grunt-cli": "^1.2.0",
@@ -25,11 +27,18 @@
     "grunt-legacssy": "latest",
     "grunt-minjson": "latest",
     "grunt-newer": "^1.2.0",
+    "grunt-pngmin": "^1.3.0",
     "grunt-sass": "latest",
     "grunt-unused": "latest",
     "grunt-usemin": "latest",
     "grunt-zip": "^0.17.1",
-    "jit-grunt": "^0.10.0"
+    "handlebars": "^4.0.11",
+    "jimp": "^0.2.28",
+    "jit-grunt": "^0.10.0",
+    "spritesmith": "^3.1.1"
+  },
+  "optionalDependencies": {
+    "canvassmith": "^1.2.0"
   },
   "scripts": {
     "build": "grunt build",

runserver.py

@@ -126,7 +126,9 @@ def validate_assets(args):
 
     static_path = os.path.join(root_path, 'static/js')
     for file in os.listdir(static_path):
-        if file.endswith(".js"):
+        if (file.endswith(".js")
+                and file != 'build_icons.js'
+                and file != 'build_spritesheet.js'):
             generated_path = os.path.join(static_path, '../dist/js/',
                                           file.replace(".js", ".min.js"))
             source_path = os.path.join(static_path, file)
@@ -138,7 +140,7 @@ def validate_assets(args):
 
     # You need custom image files now.
     if not os.path.isfile(
-            os.path.join(root_path, 'static/icons-sprite.png')):
+            os.path.join(root_path, 'static/spritesheet.png')):
         log.critical(assets_error_log)
         return False
 

static/data/pokemon_forms.json

@@ -0,0 +1,5 @@
+{
+    "201": ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", ["exclamation", "!"], ["question", "?"]],
+    "351": [["normal", "NML"], ["sunny", "SUN"], ["rainy", "RN"], ["snowy", "SNW"]],
+    "386": [["normal", "NML"], ["attack", "ATK"], ["defense", "DEF"], ["speed", "SPE"]]
+}