ColorsFixedOnApp

MapView.pde

@@ -49,7 +49,7 @@ class MapView extends View {
   float minZoom = 4;
   float maxZoom = 15;
   int minPointSize= 5;
-  int maxPointSize = 45;
+  int maxPointSize = 35;
   int minIconSize= 10;
   int maxIconSize = 25;
   int minDistSize = 1;
@@ -553,7 +553,6 @@ class MapView extends View {
           float maxPointValue =  map(zoomValue, minZoom, maxZoom, minPointSize, maxPointSize);
           float dotSize =  map(place.sightingCount, minCountSightings, maxCountSightings, minPointSize, maxPointValue);
 
-
           if ((showAirports && place.airportDist < 10) || (showMilitaryBases && place.militaryDist < 10) || (showWeatherStation && place.weatherDist < 10)){
                     buffer.stroke(0);
                     buffer.strokeWeight(2);

Sighting.pde

@@ -508,7 +508,7 @@ class SQLiteDataSource implements DataSource {
       sightingTypeMap.put(db.getInt("id"), new SightingType(
         db.getInt("id"),
         loadImage(db.getString("img_name")),
-        color(unhex("FF"+db.getString("color"))),
+        color(UFOColors[db.getInt("id")-1]),
         db.getString("name")
       ));
     }

cs424p3.pde

@@ -34,7 +34,8 @@ color airportAreaColor = #FFA500;
 color militaryBaseColor = #CC0000;
 color weatherStationColor = #FFFF00;
 color infoBoxBackground = #000000;
-color[] UFOColors = {#000000,#ffffff,#555555,#333333,#444444,#555555,#666666};
+//color[] UFOColors = {#FFFF00,#00FF00,#00FFFF,#FF8000,#800FFF,#FF0000,};
+color[] UFOColors = {#0000FF,#FF6600,#00FFFF,#FF0000,#FFFF00,#00FF00,#800FFF};
 
 int normalFontSize = 13;
 int smallFontSize = 10 ;
@@ -48,6 +49,7 @@ String[] timeLabels = {"00","01","02","03","04","05","06","07","08","09","10","1
 String[] UFOTypeLabels = {"UFOType 1","UFOType 2","UFOType 3","UFOType 4","UFOType 5","UFOType 6","UFOType 7"};
 String[] UFOImages = {"blue.png","green.png","star.png","orange.png","purple.png","red.png","yellow.png"};
 
+
 PImage airplaneImage;
 PImage militaryBaseImage;
 PImage weatherStationImage;