NPART+: Improving Wireless Network Topology Generators with Data from the Real World