Another geo.json that includes the real latitudes and longitudes. Updated the point of interest files with the centroids computed from the geo.json

country.cpp

@@ -5,6 +5,8 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 
+
+
 void Country::limits(){
     QMap<QString,QPolygonF*>::iterator it = Cities.begin();
 
@@ -42,7 +44,7 @@ bool Country::readInfoFromJSON(const QString &fileName) {
     QByteArray saveData = loadFile.readAll();
     QJsonDocument loadDoc(QJsonDocument::fromJson(saveData));
 
-    QJsonArray featureLevelArray = loadDoc.object()["features"].toArray();
+    QJsonArray featureLevelArray = loadDoc.object()["pueblos"].toObject()["features"].toArray();
     int ctr = 1;
     foreach(QJsonValue obj, featureLevelArray) {
         QPolygonF *poly = new QPolygonF;
@@ -54,7 +56,9 @@ bool Country::readInfoFromJSON(const QString &fileName) {
                 poly->push_back(QPointF(
                                 geometryArray[0].toArray()[i].toArray()[0].toDouble(),
                                 geometryArray[0].toArray()[i].toArray()[1].toDouble()));
+            qDebug() << geometryArray[0].toArray()[i].toArray()[0].toDouble();
             }
+
         }
         else {
             // for every city
@@ -71,12 +75,10 @@ bool Country::readInfoFromJSON(const QString &fileName) {
             }
         }
 
-        QString cityName = obj.toObject()["properties"].toObject()["name"].toString();
+        QString cityName = obj.toObject()["properties"].toObject()["NAME"].toString();
 
         qDebug() << "Storing: " << cityName;
-        Cities[cityName] = poly; //new City;
-        //Cities[cityName]->geometry = poly;
-
+        Cities[cityName] = poly;
         ctr++;
     }
     return true;

data/pr.txt

@@ -1,37 +1,78 @@
-San_Juan 18.4516666667 -66.0688888889
-Ponce 18.0 -66.6167
-Vieques 18.1269 -65.4239
-Bayamon 18.3833 -66.15
-Mayaguez 18.2011111111 -67.1397222222
-Culebra 18.3169 -65.29
-Carolina 18.4112152674 -65.9710121155
-Caguas 18.2342 -66.0486
-Aguadilla 18.43 -67.1544
-Arecibo 18.4705555556 -66.7208333333
-Dorado 18.4589 -66.2678
-Fajardo 18.3258 -65.6525
-Rincon 18.3402777778 -67.2516666667
-Guaynabo 18.1144444444 -66.1680555556
-Humacao 18.1497 -65.8275
-Cidra 18.1758333333 -66.1613888889
-Guayama 17.9936 -66.1308
-Santurce 18.4408333333 -66.0472222222
-Cayey 18.1144 -66.1681
-Utuado 18.2656 -66.7006
-Rio_Grande 18.3803 -65.8314
-Barceloneta 18.4506 -66.5386
-Yauco 18.0369444444 -66.8502777778
-Jayuya 18.2186 -66.5917
-Vega_Baja 18.4461111111 -66.3875
-Trujillo_Alto 18.3628 -66.0175
-Juana_Diaz 18.0525 -66.5067
-Yabucoa 18.0506 -65.8794
-Toa_Baja 18.4439 -66.2597
-Rio_Piedras 18.3997222222 -66.05
-Gurabo 18.2544 -65.9731
-Canovanas 18.3792 -65.9014
-Catano 18.4414 -66.1183
-Arroyo 17.9658 -66.0614
-Anasco 18.2818442291 -67.1422576904
-Toa_Alta 18.3883 -66.2483
-Levittown 18.45 -66.1817
+Adjuntas 18.1811 -66.7559
+Aguada 18.3604 -67.1764
+Aguadilla 18.4611 -67.1194
+AguasBuenas 18.2495 -66.1256
+Aibonito 18.1321 -66.2635
+Arecibo 18.4078 -66.6824
+Arroyo 18.0016 -66.0593
+Anasco 18.2875 -67.1262
+Barceloneta 18.4447 -66.56
+Barranquitas 18.2035 -66.3161
+Bayamon 18.3504 -66.1749
+CaboRojo 18.0403 -67.1422
+Caguas 18.212 -66.051
+Camuy 18.4199 -66.8582
+Canovanas 18.3287 -65.8799
+Carolina 18.3754 -65.9549
+Catano 18.4393 -66.1284
+Cayey 18.1038 -66.1505
+Ceiba 18.2532 -65.673
+Ciales 18.2902 -66.5248
+Cidra 18.171 -66.152
+Coamo 18.0955 -66.3613
+Comerio 18.2254 -66.2185
+Corozal 18.3081 -66.343
+Culebra 18.3199 -65.2912
+Dorado 18.4332 -66.2758
+Fajardo 18.3167 -65.6667
+Florida 18.3734 -66.5591
+Guayama 18.0087 -66.135
+Guayanilla 18.0446 -66.7924
+Guaynabo 18.3334 -66.0713
+Gurabo 18.2668 -65.977
+Guanica 17.9831 -66.921
+Hatillo 18.4094 -66.7982
+Hormigueros 18.1339 -67.1188
+Humacao 18.1445 -65.8113
+Isabela 18.4501 -67.0074
+Jayuya 18.21 -66.5878
+JuanaDiaz 18.0568 -66.5073
+Juncos 18.2278 -65.9221
+Lajas 18.0119 -67.0431
+Lares 18.2705 -66.8734
+LasMarias 18.2373 -66.9814
+LasPiedras 18.1883 -65.8735
+Loiza 18.425 -65.9025
+Luquillo 18.3418 -65.7361
+Manati 18.4164 -66.4827
+Maricao 18.1706 -66.9397
+Maunabo 18.0183 -65.9237
+Mayaguez 18.2083 -67.1081
+Moca 18.3758 -67.0883
+Morovis 18.3169 -66.4187
+Naguabo 18.2305 -65.7544
+Naranjito 18.2855 -66.2456
+Orocovis 18.2137 -66.4315
+Patillas 18.0328 -66.0134
+Penuelas 18.0614 -66.7253
+Ponce 18.059 -66.6084
+Quebradillas 18.4365 -66.9075
+Rincon 18.3367 -67.2341
+RioGrande 18.3464 -65.8119
+SabanaGrande 18.0837 -66.9399
+Salinas 18.0121 -66.2615
+SanGerman 18.1115 -67.0426
+SanJuan 18.3891 -66.0539
+SanLorenzo 18.1472 -65.9789
+SanSebastian 18.3292 -66.9719
+SantaIsabel 17.9963 -66.3879
+ToaAlta 18.3631 -66.2466
+ToaBaja 18.4274 -66.2015
+TrujilloAlto 18.3381 -66.0084
+Utuado 18.2717 -66.7067
+VegaAlta 18.4113 -66.3454
+VegaBaja 18.4288 -66.3906
+Vieques 18.1226 -65.4372
+Villalba 18.1296 -66.473
+Yabucoa 18.0717 -65.9018
+Yauco 18.079 -66.8592

data/pr10.txt

@@ -1,10 +1,11 @@
-Arroyo 17.9658 -66.0614
-Bayamon 18.3833 -66.15
-Caguas 18.2342 -66.0486
-Dorado 18.4589 -66.2678
-Fajardo 18.3258 -65.6525
-Guayama 17.9936 -66.1308
-Humacao 18.1497 -65.8275
-Jayuya 18.2186 -66.5917
-Mayaguez 18.2011111111 -67.1397222222
-Ponce 18.0 -66.6167
+Arroyo 18.0016 -66.0593
+Bayamon 18.3504 -66.1749
+Caguas 18.212 -66.051
+Dorado 18.4332 -66.2758
+Fajardo 18.3167 -65.6667
+Guayama 18.0087 -66.135
+Humacao 18.1445 -65.8113
+Jayuya 18.21 -66.5878
+Mayaguez 18.2083 -67.1081
+Ponce 18.059 -66.6084
+

map.cpp

@@ -3,6 +3,31 @@
 #include <QDesktopWidget>
 #include <QPainter>
 #include <QPen>
+#include "gispoi.h"
+
+
+QPointF centroid(const QPolygonF &poly) {
+    float A = 0.0f;
+    float Cx = 0.0f;
+    float Cy = 0.0f;
+    QVector<float> VA;
+
+    //VA.resize(poly.size());
+    int size = poly.size();
+    int ip1;
+    float prodDif;
+    for (int i = 0; i < size; i++) {
+        ip1 = (i + 1)%size;
+        prodDif = poly.at(i).x() * poly.at(ip1).y() - poly.at(i).y() * poly.at(ip1).x();
+        A += prodDif;
+        Cx += ( poly.at(i).x() + poly.at(ip1).x()) * prodDif;
+        Cy += ( poly.at(i).y() + poly.at(ip1).y()) * prodDif;
+    }
+    A = A / 2.0;
+    Cx = Cx / (6.0 * A);
+    Cy = Cy / (6.0 * A);
+    return QPointF(Cx,Cy);
+}
 
 Map::Map(QWidget *parent) :
     QWidget(parent)
@@ -12,7 +37,7 @@ Map::Map(QWidget *parent) :
     // Create country object and read data from the json file
     qDebug() << "Reading the Json...";
     myCountry = new Country;
-    myCountry->readInfoFromJSON(":/data/pr-all-all.geo.json");
+    myCountry->readInfoFromJSON(":/data/pr.geo.json");
     qDebug() << "...done, read " << myCountry->Cities.size();
 
 
@@ -33,6 +58,7 @@ Map::Map(QWidget *parent) :
 
     if (diffX > diffY) resize(mainScreenSize.width() * 0.5 , 0.5 * mainScreenSize.width()*(diffY/diffX));
     else               resize(mainScreenSize.width() * 0.5,  0.5 * mainScreenSize.width()*(diffX/diffY));
+
 }
 
 
@@ -170,6 +196,27 @@ void Map::paintEvent(QPaintEvent *) {
     int cX, cY, pX, pY;
     cX = cY = pX = pY = -1;
 
+
+/*
+    myPen.setWidth(2);
+    myPen.setColor(QColor(0x100000));
+    myPen.setBrush(QBrush(Qt::black));
+    p->setBrush(Qt::SolidPattern);
+    p->setBrush(QBrush(0xff0000));
+
+
+    QMap<QString,QPolygonF*>::iterator itc = this->myCountry->Cities.begin();
+    for (; itc != this->myCountry->Cities.end(); itc++) {
+        QPointF cent = centroid(*(itc.value()));
+        cX = factorX * (cent.x() - myCountry->minX);
+        cY = height() - factorY*(cent.y() - myCountry->minY);
+
+        p->drawEllipse(static_cast<int>(cX) - circleRadius/2, static_cast<int>(cY)- circleRadius/2, circleRadius, circleRadius);
+        qDebug() << itc.key() << cent.y() << cent.x();
+
+    }
+*/
+
     if(gisLocations) {
         myPen.setWidth(2);
         myPen.setColor(QColor(0x100000));

prMap.pro

@@ -14,10 +14,11 @@ TEMPLATE = app
 # CONFIG += c++11
 
 SOURCES += main.cpp\
+    gispoi.cpp\
         mainwindow.cpp \
     country.cpp \
-    map.cpp \
-    gispoi.cpp
+    map.cpp
+
 
 HEADERS  += mainwindow.h \
     country.h \

prmap.qrc

@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>data/pr-all-all.geo.json</file>
+        <file>data/pr.geo.json</file>
     </qresource>
 </RCC>