mpadge.tngl.sh
R package for downloading OpenStreetMap data
:wrench:couple implicit var conversions
+6
-5
+6
-5
src/convert-osm-rcpp.cpp
+6
-5
src/convert-osm-rcpp.cpp
···
390
390
// Fill plotOrder slot with int vector - this has to be int, not
391
391
// unsigned int!
392
392
std::vector <int> plotord (rels.size ());
393
-
for (int j = 0; j < static_cast <int> (rels.size ()); j++)
394
-
plotord [j] = j + 1;
393
+
for (size_t j = 0; j < rels.size (); j++)
394
+
plotord [j] = static_cast <int> (j + 1);
395
395
multipolygons.slot ("plotOrder") = plotord;
396
396
plotord.clear ();
397
397
···
513
513
string_arr2 &kv_out, const Relations &rels,
514
514
const UniqueVals &unique_vals)
515
515
{
516
-
int nmembers = 0;
516
+
size_t nmembers = 0;
517
517
for (auto itr = rels.begin (); itr != rels.end (); itr++)
518
518
nmembers += itr->relations.size ();
519
519
···
549
549
kv_iter != itr->key_val.end (); ++kv_iter)
550
550
{
551
551
const std::string &key = kv_iter->first;
552
-
long int coli = static_cast <long int> (
553
-
unique_vals.k_rel_index.at (key));
552
+
//long int coli = static_cast <long int> (
553
+
// unique_vals.k_rel_index.at (key));
554
+
unsigned int coli = unique_vals.k_rel_index.at (key);
554
555
kv_out [coli] [rowi] = kv_iter->second;
555
556
}
556
557
rowi++;